summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-07-02 18:56:52 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-07-02 19:47:48 -0300
commitcf0e1cfc8218edecfe5a25e7c458b77a16192c10 (patch)
tree13f42d44c4d9f393fda3b85a457e3b2ecad148cf
parent24da89efc92a13bb22d2eb58bf2dbde8eebed3e9 (diff)
downloadarchiso32-cf0e1cfc8218edecfe5a25e7c458b77a16192c10.tar.xz
[archiso2dual] Add support split-out any from core-pkgs.sqfs
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rwxr-xr-xarchiso2dual/archiso2dual20
-rw-r--r--archiso2dual/isomounts2
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