Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2012-08-25 15:14:51 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2012-08-25 15:14:51 -0300
commit6369815d5721e2908174d9ddc76bd9ffe32570b4 (patch)
tree06e3d7a2c9b8c8a4172d97ab90a9ed9eb8550879
parentd93c9c21873ddc269f8cde7bd39e3e54650f2489 (diff)
[archiso] Rework Makefile / Reorder files
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rw-r--r--Makefile58
-rw-r--r--hooks/archiso (renamed from archiso/hooks/archiso)0
-rw-r--r--hooks/archiso_loop_mnt (renamed from archiso/hooks/archiso_loop_mnt)0
-rw-r--r--hooks/archiso_pxe_common (renamed from archiso/hooks/archiso_pxe_common)0
-rw-r--r--hooks/archiso_pxe_http (renamed from archiso/hooks/archiso_pxe_http)0
-rw-r--r--hooks/archiso_pxe_nbd (renamed from archiso/hooks/archiso_pxe_nbd)0
-rw-r--r--hooks/archiso_pxe_nfs (renamed from archiso/hooks/archiso_pxe_nfs)0
-rw-r--r--hooks/archiso_shutdown (renamed from archiso/hooks/archiso_shutdown)0
-rw-r--r--install/archiso (renamed from archiso/install/archiso)0
-rw-r--r--install/archiso_kms (renamed from archiso/install/archiso_kms)0
-rw-r--r--install/archiso_loop_mnt (renamed from archiso/install/archiso_loop_mnt)0
-rw-r--r--install/archiso_pxe_common (renamed from archiso/install/archiso_pxe_common)0
-rw-r--r--install/archiso_pxe_http (renamed from archiso/install/archiso_pxe_http)0
-rw-r--r--install/archiso_pxe_nbd (renamed from archiso/install/archiso_pxe_nbd)0
-rw-r--r--install/archiso_pxe_nfs (renamed from archiso/install/archiso_pxe_nfs)0
-rw-r--r--install/archiso_shutdown (renamed from archiso/install/archiso_shutdown)0
-rw-r--r--script/archiso_shutdown (renamed from archiso/archiso_shutdown)0
17 files changed, 16 insertions, 42 deletions
diff --git a/Makefile b/Makefile
index cb5ec1d..0b9e035 100644
--- a/Makefile
+++ b/Makefile
@@ -1,62 +1,36 @@
V=1
+INSTALL_FILES=$(wildcard archiso/initcpio/install/*)
+HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*)
+SCRIPT_FILES=$(wildcard archiso/initcpio/script/*)
+
+
+INSTALL_DIR=$(DESTDIR)/usr/lib/initcpio/install
+HOOKS_DIR=$(DESTDIR)/usr/lib/initcpio/hooks
+SCRIPT_DIR=$(DESTDIR)/usr/lib/initcpio
+
all:
-install: install-program install-hooks install-examples install-doc
+install: install-program install-initcpio install-examples install-doc
install-program:
install -D -m 755 archiso/mkarchiso $(DESTDIR)/usr/sbin/mkarchiso
-install-hooks:
- # hooks/install are needed by mkinitcpio
- install -D -m 644 archiso/hooks/archiso $(DESTDIR)/usr/lib/initcpio/hooks/archiso
- install -D -m 644 archiso/install/archiso $(DESTDIR)/usr/lib/initcpio/install/archiso
- install -D -m 755 archiso/archiso_shutdown $(DESTDIR)/usr/lib/initcpio/archiso_shutdown
- install -D -m 644 archiso/hooks/archiso_shutdown $(DESTDIR)/usr/lib/initcpio/hooks/archiso_shutdown
- install -D -m 644 archiso/install/archiso_shutdown $(DESTDIR)/usr/lib/initcpio/install/archiso_shutdown
- install -D -m 644 archiso/hooks/archiso_pxe_common $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_common
- install -D -m 644 archiso/install/archiso_pxe_common $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_common
- install -D -m 644 archiso/hooks/archiso_pxe_nbd $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_nbd
- install -D -m 644 archiso/install/archiso_pxe_nbd $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_nbd
- install -D -m 644 archiso/hooks/archiso_pxe_http $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_http
- install -D -m 644 archiso/install/archiso_pxe_http $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_http
- install -D -m 644 archiso/hooks/archiso_pxe_nfs $(DESTDIR)/usr/lib/initcpio/hooks/archiso_pxe_nfs
- install -D -m 644 archiso/install/archiso_pxe_nfs $(DESTDIR)/usr/lib/initcpio/install/archiso_pxe_nfs
- install -D -m 644 archiso/hooks/archiso_loop_mnt $(DESTDIR)/usr/lib/initcpio/hooks/archiso_loop_mnt
- install -D -m 644 archiso/install/archiso_loop_mnt $(DESTDIR)/usr/lib/initcpio/install/archiso_loop_mnt
- install -D -m 644 archiso/install/archiso_kms $(DESTDIR)/usr/lib/initcpio/install/archiso_kms
+install-initcpio:
+ install -d $(SCRIPT_DIR) $(HOOKS_DIR) $(INSTALL_DIR)
+ install -m 755 -t $(SCRIPT_DIR) $(SCRIPT_FILES)
+ install -m 644 -t $(HOOKS_DIR) $(HOOKS_FILES)
+ install -m 644 -t $(INSTALL_DIR) $(INSTALL_FILES)
install-examples:
install -d -m 755 $(DESTDIR)/usr/share/archiso/
cp -r configs $(DESTDIR)/usr/share/archiso/
install-doc:
- install -d -m 755 $(DESTDIR)/usr/share/archiso/
install -D -m 644 README $(DESTDIR)/usr/share/doc/archiso/README
-uninstall:
- rm -f $(DESTDIR)/usr/sbin/mkarchiso
- 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/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/
- rm -f $(DESTDIR)/usr/share/doc/archiso/README
-
dist:
git archive --format=tar --prefix=archiso-$(V)/ v$(V) | gzip -9 > archiso-$(V).tar.gz
gpg --detach-sign --use-agent archiso-$(V).tar.gz
-.PHONY: install install-program install-hooks install-examples install-doc uninstall dist
+.PHONY: install install-program install-initcpio install-examples install-doc dist
diff --git a/archiso/hooks/archiso b/hooks/archiso
index 9445498..9445498 100644
--- a/archiso/hooks/archiso
+++ b/hooks/archiso
diff --git a/archiso/hooks/archiso_loop_mnt b/hooks/archiso_loop_mnt
index a02cfac..a02cfac 100644
--- a/archiso/hooks/archiso_loop_mnt
+++ b/hooks/archiso_loop_mnt
diff --git a/archiso/hooks/archiso_pxe_common b/hooks/archiso_pxe_common
index d8ac709..d8ac709 100644
--- a/archiso/hooks/archiso_pxe_common
+++ b/hooks/archiso_pxe_common
diff --git a/archiso/hooks/archiso_pxe_http b/hooks/archiso_pxe_http
index 32e8ab0..32e8ab0 100644
--- a/archiso/hooks/archiso_pxe_http
+++ b/hooks/archiso_pxe_http
diff --git a/archiso/hooks/archiso_pxe_nbd b/hooks/archiso_pxe_nbd
index a9f84d5..a9f84d5 100644
--- a/archiso/hooks/archiso_pxe_nbd
+++ b/hooks/archiso_pxe_nbd
diff --git a/archiso/hooks/archiso_pxe_nfs b/hooks/archiso_pxe_nfs
index ef41c01..ef41c01 100644
--- a/archiso/hooks/archiso_pxe_nfs
+++ b/hooks/archiso_pxe_nfs
diff --git a/archiso/hooks/archiso_shutdown b/hooks/archiso_shutdown
index e50dedb..e50dedb 100644
--- a/archiso/hooks/archiso_shutdown
+++ b/hooks/archiso_shutdown
diff --git a/archiso/install/archiso b/install/archiso
index 8893667..8893667 100644
--- a/archiso/install/archiso
+++ b/install/archiso
diff --git a/archiso/install/archiso_kms b/install/archiso_kms
index 3ff31f3..3ff31f3 100644
--- a/archiso/install/archiso_kms
+++ b/install/archiso_kms
diff --git a/archiso/install/archiso_loop_mnt b/install/archiso_loop_mnt
index 59f1d94..59f1d94 100644
--- a/archiso/install/archiso_loop_mnt
+++ b/install/archiso_loop_mnt
diff --git a/archiso/install/archiso_pxe_common b/install/archiso_pxe_common
index eec9a7e..eec9a7e 100644
--- a/archiso/install/archiso_pxe_common
+++ b/install/archiso_pxe_common
diff --git a/archiso/install/archiso_pxe_http b/install/archiso_pxe_http
index 4e02f98..4e02f98 100644
--- a/archiso/install/archiso_pxe_http
+++ b/install/archiso_pxe_http
diff --git a/archiso/install/archiso_pxe_nbd b/install/archiso_pxe_nbd
index 47d98ce..47d98ce 100644
--- a/archiso/install/archiso_pxe_nbd
+++ b/install/archiso_pxe_nbd
diff --git a/archiso/install/archiso_pxe_nfs b/install/archiso_pxe_nfs
index f8226e5..f8226e5 100644
--- a/archiso/install/archiso_pxe_nfs
+++ b/install/archiso_pxe_nfs
diff --git a/archiso/install/archiso_shutdown b/install/archiso_shutdown
index 5ae976a..5ae976a 100644
--- a/archiso/install/archiso_shutdown
+++ b/install/archiso_shutdown
diff --git a/archiso/archiso_shutdown b/script/archiso_shutdown
index 41b3945..41b3945 100644
--- a/archiso/archiso_shutdown
+++ b/script/archiso_shutdown