[SCM] live-boot branch, debian-next, updated. debian/3.0_a29-1-18-ga3d4845
Daniel Baumann
daniel at debian.org
Tue Jun 5 17:24:40 UTC 2012
The following commit has been merged in the debian-next branch:
commit a3d4845459606e7ebcf32329fe2ee204d2b196b8
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Jun 5 19:24:39 2012 +0200
Simplyfing initramfs-tools specific files within the source tree.
diff --git a/Makefile b/Makefile
index 2241dce..49a5877 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
LANGUAGES = $(shell cd manpages/po && ls)
-SCRIPTS = bin/* initramfs-tools/hooks/* initramfs-tools/scripts/live scripts/*.sh scripts/*/*
+SCRIPTS = bin/* initramfs-tools/* scripts/*.sh scripts/*/*
all: build
@@ -52,8 +52,10 @@ install:
mkdir -p $(DESTDIR)/usr/share/live-boot
cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot
- mkdir -p $(DESTDIR)/usr/share/initramfs-tools
- cp -r initramfs-tools/* $(DESTDIR)/usr/share/initramfs-tools
+ mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks
+ cp initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live
+ mkdir -p $(DESTDIR)/usr/share/initramfs-tools/scripts
+ cp initramfs-tools/live.script $(DESTDIR)/usr/share/initramfs-tools/scripts/live
# Installing docs
mkdir -p $(DESTDIR)/usr/share/doc/live-boot
@@ -87,11 +89,9 @@ uninstall:
rm -rf $(DESTDIR)/usr/share/live-boot
rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
- rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live*
- rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/live
+ rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/live
rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true
diff --git a/initramfs-tools/hooks/live b/initramfs-tools/live.hook
similarity index 100%
rename from initramfs-tools/hooks/live
rename to initramfs-tools/live.hook
diff --git a/initramfs-tools/scripts/live b/initramfs-tools/live.script
similarity index 100%
rename from initramfs-tools/scripts/live
rename to initramfs-tools/live.script
--
live-boot
More information about the debian-live-changes
mailing list