Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/releng
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-06-27 19:16:29 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-07-09 15:14:49 -0300
commit8fa4f8dedf725ba629164b0a3092ed784cbe821f (patch)
treef079a5c6ef55ff97fe59e3e0412c632fc3b80190 /configs/releng
parent3101e8d904025ba60f81814003b7e3e069109a80 (diff)
[archiso] Update for mkinitcpio >= 0.7
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'configs/releng')
-rwxr-xr-xconfigs/releng/build.sh32
-rw-r--r--configs/releng/packages.i6861
-rw-r--r--configs/releng/packages.x86_641
3 files changed, 21 insertions, 13 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index be906c2..12e7636 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -10,17 +10,10 @@ arch=$(uname -m)
work_dir=work
verbose="n"
-# This function can be called after make_basefs()
-get_linux_ver() {
- local ALL_kver
- eval $(grep ^ALL_kver ${work_dir}/root-image/etc/mkinitcpio.d/kernel26.kver)
- echo ${ALL_kver}
-}
-
# Base installation (root-image)
make_basefs() {
mkarchiso ${verbose} -D "${install_dir}" -p "base" create "${work_dir}"
- mkarchiso ${verbose} -D "${install_dir}" -p "memtest86+ syslinux" create "${work_dir}"
+ mkarchiso ${verbose} -D "${install_dir}" -p "memtest86+ syslinux mkinitcpio-nfs-utils nbd" create "${work_dir}"
}
# Additional packages (root-image)
@@ -41,14 +34,30 @@ make_customize_root_image() {
fi
}
+# Copy mkinitcpio archiso hooks (root-image)
+make_setup_mkinitcpio() {
+ if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
+ local _hook
+ for _hook in archiso archiso_pxe_nbd archiso_loop_mnt; do
+ cp /lib/initcpio/hooks/${_hook} ${work_dir}/root-image/lib/initcpio/hooks
+ cp /lib/initcpio/install/${_hook} ${work_dir}/root-image/lib/initcpio/install
+ done
+ : > ${work_dir}/build.${FUNCNAME}
+ fi
+}
+
# Prepare ${install_dir}/boot/
make_boot() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
local _src=${work_dir}/root-image
local _dst_boot=${work_dir}/iso/${install_dir}/boot
mkdir -p ${_dst_boot}/${arch}
- cp ${_src}/boot/vmlinuz26 ${_dst_boot}/${arch}
- mkinitcpio -c ./mkinitcpio.conf -b ${_src} -k $(get_linux_ver) -g ${_dst_boot}/${arch}/archiso.img
+ mkinitcpio \
+ -c ./mkinitcpio.conf \
+ -b ${_src} \
+ -k /boot/vmlinuz26 \
+ -g ${_dst_boot}/${arch}/archiso.img
+ mv ${_src}/boot/vmlinuz26 ${_dst_boot}/${arch}
cp ${_src}/boot/memtest86+/memtest.bin ${_dst_boot}/memtest
cp ${_src}/usr/share/licenses/common/GPL2/license.txt ${_dst_boot}/memtest.COPYING
: > ${work_dir}/build.${FUNCNAME}
@@ -71,7 +80,7 @@ make_syslinux() {
cp ${_src_syslinux}/memdisk ${_dst_syslinux}
mkdir -p ${_dst_syslinux}/hdt
wget -O - http://pciids.sourceforge.net/v2.2/pci.ids | gzip -9 > ${_dst_syslinux}/hdt/pciids.gz
- cat ${work_dir}/root-image/lib/modules/$(get_linux_ver)/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz
+ cat ${work_dir}/root-image/lib/modules/*-ARCH/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz
: > ${work_dir}/build.${FUNCNAME}
fi
}
@@ -233,6 +242,7 @@ make_common_single() {
make_basefs
make_packages
make_customize_root_image
+ make_setup_mkinitcpio
make_boot
make_syslinux
make_isolinux
diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686
index 11d68e5..2dce66c 100644
--- a/configs/releng/packages.i686
+++ b/configs/releng/packages.i686
@@ -17,7 +17,6 @@ ipw2100-fw
ipw2200-fw
lftp
lilo
-nbd
netcfg
nfs-utils
nilfs-utils
diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64
index 11d68e5..2dce66c 100644
--- a/configs/releng/packages.x86_64
+++ b/configs/releng/packages.x86_64
@@ -17,7 +17,6 @@ ipw2100-fw
ipw2200-fw
lftp
lilo
-nbd
netcfg
nfs-utils
nilfs-utils