[Debian-live-changes] r2581 - in dists/trunk/live-initramfs: . bin debian docs hooks scripts/live-bottom

daniel at alioth.debian.org daniel at alioth.debian.org
Thu Jul 26 17:59:59 UTC 2007


Author: daniel
Date: 2007-07-26 17:59:59 +0000 (Thu, 26 Jul 2007)
New Revision: 2581

Removed:
   dists/trunk/live-initramfs/bin/live-md5check/
Modified:
   dists/trunk/live-initramfs/Makefile
   dists/trunk/live-initramfs/debian/control
   dists/trunk/live-initramfs/debian/copyright
   dists/trunk/live-initramfs/debian/rules
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/hooks/live
   dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check
Log:


Modified: dists/trunk/live-initramfs/Makefile
===================================================================
--- dists/trunk/live-initramfs/Makefile	2007-07-26 17:58:49 UTC (rev 2580)
+++ dists/trunk/live-initramfs/Makefile	2007-07-26 17:59:59 UTC (rev 2581)
@@ -1,6 +1,5 @@
 # Makefile
 
-CFLAGS = -Wall -g -O2
 BUILD_SYSTEM := $(shell lsb_release --short --id)
 
 TRANSLATIONS="it"
@@ -17,16 +16,10 @@
 	# Setting BUILD_SYSTEM
 	sed -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' conf/live.conf > live.conf
 
-	# Building live-md5check
-	CFLAGS="$(CFLAGS)" $(MAKE) -C bin/live-md5check
-
 install: test build
 	# Installing configuration
 	install -D -m 0644 live.conf $(DESTDIR)/etc/live.conf
 
-	# Installing live-md5check
-	install -D -m 0755 bin/live-md5check/live-md5check $(DESTDIR)/usr/lib/live-initramfs/live-md5check
-
 	# Installing executables
 	mkdir -p $(DESTDIR)/sbin
 	cp bin/live-getty bin/live-login bin/live-snapshot $(DESTDIR)/sbin
@@ -75,9 +68,6 @@
 	# Uninstalling configuration
 	rm -f $(DESTDIR)/etc/live.conf
 
-	# Uninstalling live-md5check
-	rm -rf $(DESTDIR)/usr/lib/live-initramfs
-
 	# Uninstalling executables
 	rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot
 	rm -rf $(DESTDIR)/usr/share/live-initramfs
@@ -126,7 +116,6 @@
 
 clean:
 	rm -f live.conf
-	$(MAKE) -C bin/live-md5check clean
 
 distclean:
 

Modified: dists/trunk/live-initramfs/debian/control
===================================================================
--- dists/trunk/live-initramfs/debian/control	2007-07-26 17:58:49 UTC (rev 2580)
+++ dists/trunk/live-initramfs/debian/control	2007-07-26 17:59:59 UTC (rev 2581)
@@ -9,8 +9,8 @@
 XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-initramfs/
 
 Package: live-initramfs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, file, initramfs-tools, sudo, user-setup
+Architecture: all
+Depends: ${misc:Depends}, file, initramfs-tools, sudo, user-setup
 Recommends: eject, live-initscripts
 Suggests: genext2fs, squashfs-tools
 Conflicts: casper

Modified: dists/trunk/live-initramfs/debian/copyright
===================================================================
--- dists/trunk/live-initramfs/debian/copyright	2007-07-26 17:58:49 UTC (rev 2580)
+++ dists/trunk/live-initramfs/debian/copyright	2007-07-26 17:59:59 UTC (rev 2581)
@@ -36,29 +36,5 @@
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL-2 file.
 
-License (live-md5check/md5.c, live-md5check/md5,h):
-
-	Copyright (C) 1999-2002 Aladdin Enterprises
-	All rights reserved.
-
-	This software is provided 'as-is', without any express or implied
-	warranty.  In no event will the authors be held liable for any damages
-	arising from the use of this software.
-
-	Permission is granted to anyone to use this software for any purpose,
-	including commercial applications, and to alter it and redistribute it
-	freely, subject to the following restrictions:
-
-	1. The origin of this software must not be misrepresented; you must not
-	claim that you wrote the original software. If you use this software in
-	a product, an acknowledgment in the product documentation would be
-	appreciated but is not required.
-
-	2. Altered source versions must be plainly marked as such, and must not
-	be misrepresented as being the original software.
-
-	3. This notice may not be removed or altered from any source
-	distribution.
-
 The Debian packaging is (C) 2007, Daniel Baumann <daniel at debian.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

Modified: dists/trunk/live-initramfs/debian/rules
===================================================================
--- dists/trunk/live-initramfs/debian/rules	2007-07-26 17:58:49 UTC (rev 2580)
+++ dists/trunk/live-initramfs/debian/rules	2007-07-26 17:59:59 UTC (rev 2581)
@@ -3,14 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 upstream:
 	# Needs: subversion
 	cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-initramfs || true
@@ -21,7 +13,7 @@
 	dh_testdir
 
 	# Building package
-	CFLAGS="$(CFLAGS)" $(MAKE)
+	$(MAKE)
 
 	touch build-stamp
 
@@ -49,34 +41,21 @@
 	rm -f debian/live-initramfs/usr/share/doc/live-initramfs/ChangeLog
 	mv debian/live-initramfs/usr/share/doc/live-initramfs/ChangeLog.casper debian/live-initramfs/usr/share/doc/live-initramfs/changelog.casper
 
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i docs/ChangeLog
-	dh_installdocs -i
-	dh_install -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
 binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a docs/ChangeLog
-	dh_installdocs -a
-	dh_install -a
-	dh_installinit -a --no-restart-on-upgrade --no-start -- start 89 0 6 .
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
 
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs docs/ChangeLog
+	dh_installdocs
+	dh_install
+	dh_installinit --no-restart-on-upgrade --no-start -- start 89 0 6 .
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install

Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-07-26 17:58:49 UTC (rev 2580)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-07-26 17:59:59 UTC (rev 2581)
@@ -1,5 +1,9 @@
 2007-07-26  Daniel Baumann  <daniel at debian.org>
 
+	* bin/live-md5check:
+	  - Removed, using standard md5sum which makes the md5 check slower,
+	    doesn't integrate well with usplash yet, but it makes live-initramfs
+	    architecture independent now.
 	* scripts/live:
 	  - Fixed typo.
 	  - Added live-media-path as suggested by Jordi Pujol

Modified: dists/trunk/live-initramfs/hooks/live
===================================================================
--- dists/trunk/live-initramfs/hooks/live	2007-07-26 17:58:49 UTC (rev 2580)
+++ dists/trunk/live-initramfs/hooks/live	2007-07-26 17:59:59 UTC (rev 2581)
@@ -39,7 +39,6 @@
 mkdir -p "${DESTDIR}"/lib/live-initramfs
 
 # Executables
-copy_exec /usr/lib/live-initramfs/live-md5check /bin
 copy_exec /usr/share/live-initramfs/live-reconfigure /bin
 copy_exec /usr/share/live-initramfs/live-preseed /bin
 
@@ -99,6 +98,9 @@
 	copy_exec /usr/bin/eject /bin
 fi
 
+# Program: md5sum
+copy_exec /usr/bin/md5sum /bin
+
 # Program: udev
 if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
 then

Modified: dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check	2007-07-26 17:58:49 UTC (rev 2580)
+++ dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check	2007-07-26 17:59:59 UTC (rev 2581)
@@ -20,4 +20,7 @@
 
 # live-initramfs script
 
-grep integrity-check /proc/cmdline && live-md5check /live/image /live/image/md5sum.txt < /dev/tty8
+grep -qs integrity-check /proc/cmdline || exit 0
+
+cd /live/image
+md5sum -c md5sum.txt < /dev/tty8




More information about the Debian-live-changes mailing list