[arch-releng] [PATCH 0/2] Add support to split-out "any" packages for dual images.
Saves about ~11MB Patches avail at git://github.com/djgera/archiso.git in "djgera" branch.
Allows split-out "any" packages in a simple way, then mounting it as union layer. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso2dual/isomounts | 4 ++-- configs/syslinux-iso/Makefile | 2 +- configs/syslinux-iso/isomounts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archiso2dual/isomounts b/archiso2dual/isomounts index b171af8..3cc5a05 100644 --- a/archiso2dual/isomounts +++ b/archiso2dual/isomounts @@ -1,7 +1,7 @@ i686/overlay.sqfs i686 / squashfs x86_64/overlay.sqfs x86_64 / squashfs -i686/core-pkgs.sqfs i686 /src/core/pkg squashfs -x86_64/core-pkgs.sqfs x86_64 /src/core/pkg squashfs +i686/core-pkgs.sqfs i686 / squashfs +x86_64/core-pkgs.sqfs x86_64 / squashfs any/usrshare.sqfs i686 / squashfs any/usrshare.sqfs x86_64 / squashfs i686/libmodules.sqfs i686 / squashfs diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile index e719075..0d95b32 100644 --- a/configs/syslinux-iso/Makefile +++ b/configs/syslinux-iso/Makefile @@ -71,7 +71,7 @@ $(WORKDIR)/isomounts: isomounts root-image # Rule for make the [core] repo packages core-pkgs: - ./download-repo.sh core $(WORKDIR)/core-pkgs + ./download-repo.sh core $(WORKDIR)/core-pkgs/src/core/pkg # Clean-up all work diff --git a/configs/syslinux-iso/isomounts b/configs/syslinux-iso/isomounts index 71421b6..6998f3b 100644 --- a/configs/syslinux-iso/isomounts +++ b/configs/syslinux-iso/isomounts @@ -8,5 +8,5 @@ # ORDER MATTERS! Files take top-down precedence. Be careful overlay.sqfs @ARCH@ / squashfs -core-pkgs.sqfs @ARCH@ /src/core/pkg squashfs +core-pkgs.sqfs @ARCH@ / squashfs root-image.sqfs @ARCH@ / squashfs -- 1.7.1.1
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso2dual/archiso2dual | 20 ++++++++++++++++++++ archiso2dual/isomounts | 2 ++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/archiso2dual/archiso2dual b/archiso2dual/archiso2dual index 0cc58af..0654602 100755 --- a/archiso2dual/archiso2dual +++ b/archiso2dual/archiso2dual @@ -132,6 +132,24 @@ libmodules_make_image() { done } +core_pkgs_make_image() { + echo "Executing: ${FUNCNAME}" + mkdir -p ${work_dir}/tmp/any/core-any-pkgs/src/core/pkg + cp -a ${work_dir}/tmp/i686/core-pkgs/src/core/pkg/*-any.pkg.* ${work_dir}/tmp/any/core-any-pkgs/src/core/pkg + for _arch in i686 x86_64; do + rm -rf ${work_dir}/tmp/${_arch}/core-pkgs/src/core/pkg/*-any.pkg.* + mksquashfs_image core-pkgs ${_arch} + done + mksquashfs_image core-any-pkgs any +} + +core_pkgs_extract() { + echo "Executing: ${FUNCNAME}" + for _arch in i686 x86_64; do + unsquashfs_image core-pkgs ${_arch} + done +} + root_image_extract() { echo "Executing: ${FUNCNAME}" for _arch in i686 x86_64; do @@ -353,8 +371,10 @@ if [ ${profile_type} = "full" ] || [ ${profile_type} = "split" ]; then if [ ${profile_type} = "full" ]; then root_image_purge fi + core_pkgs_extract usrshare_make_image libmodules_make_image root_image_make_image + core_pkgs_make_image fi make_iso diff --git a/archiso2dual/isomounts b/archiso2dual/isomounts index 3cc5a05..ead8067 100644 --- a/archiso2dual/isomounts +++ b/archiso2dual/isomounts @@ -1,5 +1,7 @@ i686/overlay.sqfs i686 / squashfs x86_64/overlay.sqfs x86_64 / squashfs +any/core-any-pkgs.sqfs i686 / squashfs +any/core-any-pkgs.sqfs x86_64 / squashfs i686/core-pkgs.sqfs i686 / squashfs x86_64/core-pkgs.sqfs x86_64 / squashfs any/usrshare.sqfs i686 / squashfs -- 1.7.1.1
Am 03.07.2010 01:33, schrieb Gerardo Exequiel Pozzi:
Saves about ~11MB
Patches avail at git://github.com/djgera/archiso.git in "djgera" branch.
Looks nice. I will pull this tomorrow, when I am not as tired as right now and am actually able to understand what you did :)
participants (2)
-
Gerardo Exequiel Pozzi
-
Thomas Bächler