Adding live-helper 1.0~a7-1.

4 files changed, 160 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 3912ed3..ff1db92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+live-helper (1.0~a7-1) unstable; urgency=medium
+
+  * New upstream release:
+    - make-live unmounts proc and sys on exit and failures
+      (Closes: #394334, #410147).
+    - supporting sudo (Closes: #387069).
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 23 Apr 2007 00:00:00 +0200
+
 live-helper (1.0~a6-1) unstable; urgency=low
 
   * New upstream release.
@@ -18,7 +27,7 @@ live-helper (1.0~a4-1) unstable; urgency=low
 
 live-helper (1.0~a3-2) unstable; urgency=low
 
-  * Fixed typo in maintainer scripts.
+  * New upstream snapshot.
 
  -- Daniel Baumann <daniel@debian.org>  Mon, 26 Mar 2007 17:00:00 +0200
 
@@ -36,15 +45,13 @@ live-helper (1.0~a2-1) unstable; urgency=low
 
 live-helper (1.0~a1-3) unstable; urgency=low
 
-  * helpers/lh_chroot_hacks: Added removal of udev persistent-net rule.
+  * New upstream snapshot.
 
  -- Daniel Baumann <daniel@debian.org>  Wed, 14 Mar 2007 21:00:00 +0100
 
 live-helper (1.0~a1-2) unstable; urgency=low
 
-  * functions/defaults.sh: Fixed setting of LIVE_SYSVINIT.
-  * helpers/lh_chroot_sysvinit: Changed check for LIVE_SYSVINIT from disabled to
-    enabled.
+  * New upstream snapshot.
 
  -- Daniel Baumann <daniel@debian.org>  Wed, 14 Mar 2007 18:00:00 +0100
 
diff --git a/debian/cron.daily b/debian/cron.daily
new file mode 100644
index 0000000..ccb9b2b
--- /dev/null
+++ b/debian/cron.daily
@@ -0,0 +1,128 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="daily"
+
+# Check for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Check for live-helper defaults
+if [ -r /etc/default/live-helper ]
+then
+	. /etc/default/live-helper
+else
+	echo "E: /etc/default/live-helper missing."
+	exit 1
+fi
+
+# Check for autobuild
+if [ "${AUTOBUILD}" != "enabled" ]
+then
+	exit 0
+fi
+
+# Check for build directory
+if [ ! -d "${AUTOBUILD_TEMPDIR}" ]
+then
+	mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES}
+do
+	for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS}
+		do
+			if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ]
+		then
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
+		fi
+
+		if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
+		then
+			# Workaround of missing multi-binary support in live-helper
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp
+			rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_*
+			mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt
+			cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
+		fi
+
+		# Cleanup
+		cd "${AUTOBUILD_TEMPDIR}"/debian-live
+		lh_clean
+		done
+
+	# Cleanup
+	cd "${AUTOBUILD_TEMPDIR}"/debian-live
+	lh_clean purge
+	done
+done
+
+# Cleanup
+if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys
+fi
+
+rm -rf "${AUTOBUILD_TEMPDIR}"
+
+# md5sums
+for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Current symlink
+rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
diff --git a/debian/default b/debian/default
new file mode 100644
index 0000000..5d26a72
--- /dev/null
+++ b/debian/default
@@ -0,0 +1,15 @@
+# Defaults for /etc/cron.daily/live-helper
+
+AUTOBUILD="disabled"
+
+AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`"
+AUTOBUILD_DISTRIBUTIONS="sid"
+AUTOBUILD_PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+AUTOBUILD_OPTIONS="--apt-recommends disabled"
+
+AUTOBUILD_DATE="`date +%Y%m%d`"
+AUTOBUILD_DESTDIR="/srv/debian-live"
+AUTOBUILD_TEMPDIR="/srv/tmp"
+
+AUTOBUILD_MIRROR="http://ftp.debian.org/debian/"
+AUTOBUILD_MIRROR_SECURITY="http://security.debian.org/"
diff --git a/debian/rules b/debian/rules
index 5ed04e6..687cd3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,13 +25,14 @@ install: build
 	# Installing package
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/live-helper
 
-	install -m 644 debian/changelog.old debian/live-helper/usr/share/doc/live-helper/changelog.Debian.old
+	install -D -m 0644 debian/changelog.old debian/live-helper/usr/share/doc/live-helper/changelog.Debian.old
+
+	install -D -m 0644 debian/default debian/live-helper/etc/default/live-helper
 
 	# Removing double files
 	rm -f debian/live-helper/usr/share/doc/live-helper/COPYING
 	rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog
-	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.old \
-		debian/live-helper/usr/share/doc/live-helper/changelog.old
+	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.old debian/live-helper/usr/share/doc/live-helper/changelog.old
 
 binary-arch: build install
 
@@ -41,6 +42,7 @@ binary-indep: build install
 	dh_installchangelogs doc/ChangeLog
 	dh_installdocs
 	dh_install
+	dh_installcron
 	dh_installman
 	dh_compress
 	dh_fixperms