[arch-releng] [RFC] [PATCH] [archiso] /lib/initcpio -> /usr/lib/initcpio
Gerardo Exequiel Pozzi
vmlinuz386 at yahoo.com.ar
Sun Mar 4 19:06:33 EST 2012
Needs mkinitpcio >= 0.8.4
Next changes will be for mdadm and mkinitcpio-nfs-utils:
* /lib/initcpio/udev/11-dm-initramfs.rules
* /lib/initcpio/ipconfig , /lib/initcpio/nfsmount
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
archiso/Makefile | 68 +++++++++++++++++++-------------------
archiso/install/archiso_pxe_nbd | 2 +-
archiso/install/archiso_shutdown | 2 +-
configs/baseline/build.sh | 4 +--
configs/releng/build.sh | 10 +++---
5 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/archiso/Makefile b/archiso/Makefile
index cf7cd05..28868bf 100644
--- a/archiso/Makefile
+++ b/archiso/Makefile
@@ -10,23 +10,23 @@ install-program:
install-hooks:
# hooks/install are needed by mkinitcpio
- install -D -m 644 hooks/archiso $(DESTDIR)/lib/initcpio/hooks/archiso
- install -D -m 644 install/archiso $(DESTDIR)/lib/initcpio/install/archiso
- install -D -m 755 archiso_shutdown $(DESTDIR)/lib/initcpio/archiso_shutdown
- install -D -m 644 hooks/archiso_shutdown $(DESTDIR)/lib/initcpio/hooks/archiso_shutdown
- install -D -m 644 install/archiso_shutdown $(DESTDIR)/lib/initcpio/install/archiso_shutdown
- install -D -m 644 archiso_pxe_nbd $(DESTDIR)/lib/initcpio/archiso_pxe_nbd
- install -D -m 644 hooks/archiso_pxe_common $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_common
- install -D -m 644 install/archiso_pxe_common $(DESTDIR)/lib/initcpio/install/archiso_pxe_common
- install -D -m 644 hooks/archiso_pxe_nbd $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nbd
- install -D -m 644 install/archiso_pxe_nbd $(DESTDIR)/lib/initcpio/install/archiso_pxe_nbd
- install -D -m 644 hooks/archiso_pxe_http $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_http
- install -D -m 644 install/archiso_pxe_http $(DESTDIR)/lib/initcpio/install/archiso_pxe_http
- install -D -m 644 hooks/archiso_pxe_nfs $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nfs
- install -D -m 644 install/archiso_pxe_nfs $(DESTDIR)/lib/initcpio/install/archiso_pxe_nfs
- install -D -m 644 hooks/archiso_loop_mnt $(DESTDIR)/lib/initcpio/hooks/archiso_loop_mnt
- install -D -m 644 install/archiso_loop_mnt $(DESTDIR)/lib/initcpio/install/archiso_loop_mnt
- install -D -m 644 install/archiso_kms $(DESTDIR)/lib/initcpio/install/archiso_kms
+ install -D -m 644 hooks/archiso $(DESTDIR)/usr/lib/initcpio/hooks/archiso
+ install -D -m 644 install/archiso $(DESTDIR)/usr/lib/initcpio/install/archiso
+ install -D -m 755 archiso_shutdown $(DESTDIR)/usr/lib/initcpio/archiso_shutdown
+ install -D -m 644 hooks/archiso_shutdown $(DESTDIR)/usr/lib/initcpio/hooks/archiso_shutdown
+ install -D -m 644 install/archiso_shutdown $(DESTDIR)/usr/lib/initcpio/install/archiso_shutdown
+ install -D -m 644 archiso_pxe_nbd $(DESTDIR)/usr/lib/initcpio/archiso_pxe_nbd
+ install -D -m 644 hooks/archiso_pxe_common $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_common
+ install -D -m 644 install/archiso_pxe_common $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_common
+ install -D -m 644 hooks/archiso_pxe_nbd $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_nbd
+ install -D -m 644 install/archiso_pxe_nbd $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_nbd
+ install -D -m 644 hooks/archiso_pxe_http $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_http
+ install -D -m 644 install/archiso_pxe_http $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_http
+ install -D -m 644 hooks/archiso_pxe_nfs $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_nfs
+ install -D -m 644 install/archiso_pxe_nfs $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_nfs
+ install -D -m 644 hooks/archiso_loop_mnt $(DESTDIR)/usr/lib/initcpio/hooks/archiso_loop_mnt
+ install -D -m 644 install/archiso_loop_mnt $(DESTDIR)/usr/lib/initcpio/install/archiso_loop_mnt
+ install -D -m 644 install/archiso_kms $(DESTDIR)/usr/lib/initcpio/install/archiso_kms
install-examples:
# install examples
@@ -40,23 +40,23 @@ install-doc:
uninstall:
rm -f $(DESTDIR)/usr/sbin/mkarchiso
rm -f $(DESTDIR)/usr/bin/testiso
- rm -f $(DESTDIR)/lib/initcpio/hooks/archiso
- rm -f $(DESTDIR)/lib/initcpio/install/archiso
- rm -f $(DESTDIR)/lib/initcpio/archiso_shutdown
- rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_shutdown
- rm -f $(DESTDIR)/lib/initcpio/install/archiso_shutdown
- rm -f $(DESTDIR)/lib/initcpio/archiso_pxe_nbd
- rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_common
- rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_common
- rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nbd
- rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_nbd
- rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_http
- rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_http
- rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nfs
- rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_nfs
- rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_loop_mnt
- rm -f $(DESTDIR)/lib/initcpio/install/archiso_loop_mnt
- rm -f $(DESTDIR)/lib/initcpio/install/archiso_kms
+ rm -f $(DESTDIR)/usr/lib/initcpio/hooks/archiso
+ rm -f $(DESTDIR)/usr/lib/initcpio/install/archiso
+ rm -f $(DESTDIR)/usr/lib/initcpio/archiso_shutdown
+ rm -f $(DESTDIR)/usr/lib/initcpio/hooks/archiso_shutdown
+ rm -f $(DESTDIR)/usr/lib/initcpio/install/archiso_shutdown
+ rm -f $(DESTDIR)/usr/lib/initcpio/archiso_pxe_nbd
+ rm -f $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_common
+ rm -f $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_common
+ rm -f $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_nbd
+ rm -f $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_nbd
+ rm -f $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_http
+ rm -f $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_http
+ rm -f $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_nfs
+ rm -f $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_nfs
+ rm -f $(DESTDIR)/usr/lib/initcpio/hooks/archiso_loop_mnt
+ rm -f $(DESTDIR)/usr/lib/initcpio/install/archiso_loop_mnt
+ rm -f $(DESTDIR)/usr/lib/initcpio/install/archiso_kms
rm -rf $(DESTDIR)/usr/share/archiso/
.PHONY: install install-program install-hooks install-examples install-doc uninstall
diff --git a/archiso/install/archiso_pxe_nbd b/archiso/install/archiso_pxe_nbd
index 0784e2c..1ee3910 100644
--- a/archiso/install/archiso_pxe_nbd
+++ b/archiso/install/archiso_pxe_nbd
@@ -6,7 +6,7 @@ build() {
add_binary nbd-client
- add_file /lib/initcpio/archiso_pxe_nbd /archiso_pxe_nbd
+ add_file /usr/lib/initcpio/archiso_pxe_nbd /archiso_pxe_nbd
}
help() {
diff --git a/archiso/install/archiso_shutdown b/archiso/install/archiso_shutdown
index 7ef3137..87b8297 100644
--- a/archiso/install/archiso_shutdown
+++ b/archiso/install/archiso_shutdown
@@ -3,7 +3,7 @@
build() {
SCRIPT="archiso_shutdown"
- add_file /lib/initcpio/archiso_shutdown /shutdown
+ add_file /usr/lib/initcpio/archiso_shutdown /shutdown
}
help() {
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 36cab15..1f2251d 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -22,8 +22,8 @@ make_basefs() {
# Copy mkinitcpio archiso hooks (root-image)
make_setup_mkinitcpio() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
- cp /lib/initcpio/hooks/archiso ${work_dir}/root-image/lib/initcpio/hooks
- cp /lib/initcpio/install/archiso ${work_dir}/root-image/lib/initcpio/install
+ cp /usr/lib/initcpio/hooks/archiso ${work_dir}/root-image/usr/lib/initcpio/hooks
+ cp /usr/lib/initcpio/install/archiso ${work_dir}/root-image/usr/lib/initcpio/install
cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-archiso.conf
: > ${work_dir}/build.${FUNCNAME}
fi
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 4967863..42836a9 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -29,12 +29,12 @@ make_setup_mkinitcpio() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
local _hook
for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs 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
+ cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/root-image/usr/lib/initcpio/hooks
+ cp /usr/lib/initcpio/install/${_hook} ${work_dir}/root-image/usr/lib/initcpio/install
done
- cp /lib/initcpio/install/archiso_kms ${work_dir}/root-image/lib/initcpio/install
- cp /lib/initcpio/archiso_shutdown ${work_dir}/root-image/lib/initcpio
- cp /lib/initcpio/archiso_pxe_nbd ${work_dir}/root-image/lib/initcpio
+ cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/root-image/usr/lib/initcpio/install
+ cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/root-image/usr/lib/initcpio
+ cp /usr/lib/initcpio/archiso_pxe_nbd ${work_dir}/root-image/usr/lib/initcpio
cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-archiso.conf
: > ${work_dir}/build.${FUNCNAME}
fi
--
1.7.9.2
More information about the arch-releng
mailing list