[SCM] live-build branch, debian, updated. debian/3.0_a25-1-57-g6167d10
Daniel Baumann
daniel at debian.org
Thu Aug 4 19:53:18 UTC 2011
The following commit has been merged in the debian branch:
commit 4c08b4f17b9bf54e45ccf154cf09a81fef8c1930
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jul 20 10:29:57 2011 +0200
Updating cron scripts.
diff --git a/cron/TODO b/cron/TODO
index 231d208..67076b7 100644
--- a/cron/TODO
+++ b/cron/TODO
@@ -1,5 +1,6 @@
-* add headers to log with build date and versions.
-* send summary mails to debian-live at l.d.o.
-* do not hardcode git urls.
-* add support for git branches.
-* add support for git snapshot packages.
+General:
+ * add headers to log with build date and versions.
+ * send summary mails to debian-live at l.d.o.
+ * do not hardcode git urls.
+ * add support for git branches.
+ * add live-build-cron-packages.
diff --git a/cron/live-build-cron-images b/cron/live-build-cron-images
index 6e89b77..ed709a2 100755
--- a/cron/live-build-cron-images
+++ b/cron/live-build-cron-images
@@ -1,23 +1,11 @@
#!/bin/sh
-## live-build-cron-images(7) - FIXME
-## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2011 Daniel Baumann <daniel at debian.org>
##
-## This program is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see <http://www.gnu.org/licenses/>.
-##
-## The complete text of the GNU General Public License
-## can be found in /usr/share/common-licenses/GPL-3 file.
+## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
#set -e
@@ -58,18 +46,18 @@ Init ()
Setup ()
{
- TMPDIR="$(mktemp -d -t live-build-cron-images.XXXXXXXX)"
+ _TMPDIR="$(mktemp -d -t live-build-cron-images.XXXXXXXX)"
case "${LIVE_BUILD_CRON_IMAGES_BUILD}" in
git)
- cd "${TMPDIR}"
+ cd "${_TMPDIR}"
git clone git://live.debian.net/git/live-build.git
git checkout debian-old-2.0
- LB_BASE="${TMPDIR}/live-build"
+ LB_BASE="${_TMPDIR}/live-build"
export LB_BASE
- PATH="${PATH}:${TMPDIR}/live-build/scripts/build"
+ PATH="${PATH}:${_TMPDIR}/live-build/scripts/build"
export PATH
;;
@@ -82,10 +70,10 @@ Setup ()
dget "http://live.debian.net/archive/packages/live-build/${LIVE_BUILD}/live-build_${LIVE_BUILD}.dsc"
dpkg-source -x live-build_${LIVE_BUILD}.dsc
- LB_BASE="${TMPDIR}/live-build-$(echo ${LIVE_BUILD} | awk -F- '{ print $1 }')"
+ LB_BASE="${_TMPDIR}/live-build-$(echo ${LIVE_BUILD} | awk -F- '{ print $1 }')"
export LB_BASE
- PATH="${PATH}:${TMPDIR}/live-build-$(echo ${LIVE_BUILD} | awk -F- '{ print $1 }')/scripts/build"
+ PATH="${PATH}:${_TMPDIR}/live-build-$(echo ${LIVE_BUILD} | awk -F- '{ print $1 }')/scripts/build"
export PATH
else
echo "E: dget - command not found"
@@ -100,8 +88,8 @@ Setup ()
;;
esac
- mkdir -p "${TMPDIR}/build"
- cd "${TMPDIR}/build"
+ mkdir -p "${_TMPDIR}/build"
+ cd "${_TMPDIR}/build"
# live-boot
if [ -n "${LIVE_BOOT}" ]
@@ -163,7 +151,7 @@ Setup ()
Build ()
{
- cd "${TMPDIR}/build"
+ cd "${_TMPDIR}/build"
for DISTRIBUTION in ${DISTRIBUTIONS}
do
@@ -251,7 +239,7 @@ Install ()
BUILD="$((${BUILD} + 1))"
done
- cd "${TMPDIR}/build"
+ cd "${_TMPDIR}/build"
# Move iso images
if ls debian-live-${DISTRIBUTION}-${ARCHITECTURE}-*.iso* > /dev/null 2>&1
@@ -309,11 +297,11 @@ Install ()
Clean ()
{
- cd "${TMPDIR}/build"
+ cd "${_TMPDIR}/build"
lb clean --purge
cd "${CURDIR}"
- rm -rf "${TMPDIR}"
+ rm -rf "${_TMPDIR}"
}
Trace ()
diff --git a/cron/live-build-cron-manual b/cron/live-build-cron-manual
index 7bf9a86..de38a32 100755
--- a/cron/live-build-cron-manual
+++ b/cron/live-build-cron-manual
@@ -1,23 +1,11 @@
#!/bin/sh
-## live-build-cron-manual(7) - FIXME
-## Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2011 Daniel Baumann <daniel at debian.org>
##
-## This program is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see <http://www.gnu.org/licenses/>.
-##
-## The complete text of the GNU General Public License
-## can be found in /usr/share/common-licenses/GPL-3 file.
+## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
#set -e
@@ -39,31 +27,33 @@ Init ()
if [ "${LIVE_BUILD_CRON_MANUAL}" != "true" ]
then
- echo "live-build-cron-manual disabled."
+ echo "I: live-build-cron-manual disabled."
exit 0
fi
if [ -z "${LIVE_BUILD_CRON_MANUAL_DIRECTORY}" ]
then
- echo "live-build-cron-manual directory not set."
+ echo "E: live-build-cron-manual directory not set."
exit 1
fi
}
Setup ()
{
- TMPDIR="$(mktemp -d -t live-build-cron-manual.XXXXXXXX)"
+ _TMPDIR="$(mktemp -d -t live-build-cron-manual.XXXXXXXX)"
- cd "${TMPDIR}"
+ cd "${_TMPDIR}"
git clone git://live.debian.net/git/live-manual.git
+
cd live-manual && git checkout debian-next
}
Build ()
{
- cd "${TMPDIR}/live-manual"
+ cd "${_TMPDIR}/live-manual"
- echo "Using the following sisu package versions: " | tee build.log
+ echo "live-build-cron-manual: $(LC_ALL=C date -R) on ${_HOSTNAME}" | tee build.log
+ echo "Using the following sisu package versions: " | tee -a build.log
for _PACKAGE in $(dpkg --get-selections | awk '/^sisu/ { print $1 }')
do
@@ -78,13 +68,13 @@ Install ()
cd "${LIVE_BUILD_CRON_MANUAL_DIRECTORY}"
rm -rf *
- mv "${TMPDIR}/live-manual/build/"* ./
- mv "${TMPDIR}/live-manual/build.log" ./
+ mv "${_TMPDIR}/live-manual/build/"* ./
+ mv "${_TMPDIR}/live-manual/build.log" ./
}
Clean ()
{
- rm -rf "${TMPDIR}"
+ rm -rf "${_TMPDIR}"
}
Trace ()
--
live-build
More information about the debian-live-changes
mailing list