[arch-releng] [PATCH] [configs/releng] Adjust for /lib/modules -> /usr/lib/modules move
Although everything should be fine now (due to the /lib -> /usr/lib symlink), adjust everything to the proper path. --- configs/releng/aitab.core | 2 +- configs/releng/aitab.netinstall | 2 +- configs/releng/build.sh | 6 +++--- 3 Dateien geändert, 5 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) diff --git a/configs/releng/aitab.core b/configs/releng/aitab.core index 6d10a75..197bded 100644 --- a/configs/releng/aitab.core +++ b/configs/releng/aitab.core @@ -1,6 +1,6 @@ # <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size> root-image / %ARCH% xz ext4 50% -lib-modules /lib/modules %ARCH% xz ext4 50% +lib-modules /usr/lib/modules %ARCH% xz ext4 50% usr-share /usr/share any xz ext4 50% repo-core-%ARCH% /repo/core/%ARCH% %ARCH% xz none 0 repo-core-any /repo/core/any any xz none 0 diff --git a/configs/releng/aitab.netinstall b/configs/releng/aitab.netinstall index 2231154..736713f 100644 --- a/configs/releng/aitab.netinstall +++ b/configs/releng/aitab.netinstall @@ -1,4 +1,4 @@ # <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size> root-image / %ARCH% xz ext4 50% -lib-modules /lib/modules %ARCH% xz ext4 50% +lib-modules /usr/lib/modules %ARCH% xz ext4 50% usr-share /usr/share any xz ext4 50% diff --git a/configs/releng/build.sh b/configs/releng/build.sh index b18c756..5d955ae 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -121,7 +121,7 @@ make_syslinux() { cp ${_src_syslinux}/memdisk ${_dst_syslinux} mkdir -p ${_dst_syslinux}/hdt cat ${work_dir}/root-image/usr/share/hwdata/pci.ids | gzip -9 > ${_dst_syslinux}/hdt/pciids.gz - cat ${work_dir}/root-image/lib/modules/*-ARCH/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz + cat ${work_dir}/root-image/usr/lib/modules/*-ARCH/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz : > ${work_dir}/build.${FUNCNAME} fi } @@ -157,10 +157,10 @@ make_customize_root_image() { fi } -# Split out /lib/modules from root-image (makes more "dual-iso" friendly) +# Split out /usr/lib/modules from root-image (makes more "dual-iso" friendly) make_lib_modules() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then - mv ${work_dir}/root-image/lib/modules ${work_dir}/lib-modules + mv ${work_dir}/root-image/usr/lib/modules ${work_dir}/lib-modules : > ${work_dir}/build.${FUNCNAME} fi } -- 1.7.11.2
On 07/14/2012 11:07 AM, Thomas Bächler wrote:
Although everything should be fine now (due to the /lib -> /usr/lib symlink), adjust everything to the proper path. --- configs/releng/aitab.core | 2 +- configs/releng/aitab.netinstall | 2 +- configs/releng/build.sh | 6 +++--- 3 Dateien geändert, 5 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)
diff --git a/configs/releng/aitab.core b/configs/releng/aitab.core index 6d10a75..197bded 100644 --- a/configs/releng/aitab.core +++ b/configs/releng/aitab.core @@ -1,6 +1,6 @@ # <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size> root-image / %ARCH% xz ext4 50% -lib-modules /lib/modules %ARCH% xz ext4 50% +lib-modules /usr/lib/modules %ARCH% xz ext4 50% usr-lib-modules will look better
usr-share /usr/share any xz ext4 50% repo-core-%ARCH% /repo/core/%ARCH% %ARCH% xz none 0 repo-core-any /repo/core/any any xz none 0 diff --git a/configs/releng/aitab.netinstall b/configs/releng/aitab.netinstall index 2231154..736713f 100644 --- a/configs/releng/aitab.netinstall +++ b/configs/releng/aitab.netinstall @@ -1,4 +1,4 @@ # <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size> root-image / %ARCH% xz ext4 50% -lib-modules /lib/modules %ARCH% xz ext4 50% +lib-modules /usr/lib/modules %ARCH% xz ext4 50% same here usr-share /usr/share any xz ext4 50% diff --git a/configs/releng/build.sh b/configs/releng/build.sh index b18c756..5d955ae 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -121,7 +121,7 @@ make_syslinux() { cp ${_src_syslinux}/memdisk ${_dst_syslinux} mkdir -p ${_dst_syslinux}/hdt cat ${work_dir}/root-image/usr/share/hwdata/pci.ids | gzip -9 > ${_dst_syslinux}/hdt/pciids.gz - cat ${work_dir}/root-image/lib/modules/*-ARCH/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz + cat ${work_dir}/root-image/usr/lib/modules/*-ARCH/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz : > ${work_dir}/build.${FUNCNAME} fi } @@ -157,10 +157,10 @@ make_customize_root_image() { fi }
-# Split out /lib/modules from root-image (makes more "dual-iso" friendly) +# Split out /usr/lib/modules from root-image (makes more "dual-iso" friendly) make_lib_modules() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then - mv ${work_dir}/root-image/lib/modules ${work_dir}/lib-modules + mv ${work_dir}/root-image/usr/lib/modules ${work_dir}/lib-modules : > ${work_dir}/build.${FUNCNAME} fi }
also rename function :) Thanks PS: git:// ? -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
Am 15.07.2012 21:28, schrieb Gerardo Exequiel Pozzi:
-lib-modules /lib/modules %ARCH% xz ext4 50% +lib-modules /usr/lib/modules %ARCH% xz ext4 50% usr-lib-modules will look better
I see. This was sort of a quick fix. I'll be on vacation tomorrow, so I won't fix this up :)
PS: git:// ?
Just on my hard drive, and apparently in Pierre's testing branch: https://github.com/pierres/archiso/commits/testing
On 07/15/2012 04:43 PM, Thomas Bächler wrote:
Am 15.07.2012 21:28, schrieb Gerardo Exequiel Pozzi:
-lib-modules /lib/modules %ARCH% xz ext4 50% +lib-modules /usr/lib/modules %ARCH% xz ext4 50% usr-lib-modules will look better I see. This was sort of a quick fix.
I'll be on vacation tomorrow, so I won't fix this up :) No problem, I now on vacation now, (in my house) so I will take on this.
PS: git:// ? Just on my hard drive, and apparently in Pierre's testing branch: https://github.com/pierres/archiso/commits/testing
OK PS: I take archiso project as my "final work career", so its probably to document it in all parts to an "easy level" in spanish ;) -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
participants (2)
-
Gerardo Exequiel Pozzi
-
Thomas Bächler