[Debian-live-changes] r2080 - in dists/trunk/live-helper: data helpers manpages
daniel at alioth.debian.org
daniel at alioth.debian.org
Thu Jun 14 09:21:34 UTC 2007
Author: daniel
Date: 2007-06-14 09:21:33 +0000 (Thu, 14 Jun 2007)
New Revision: 2080
Added:
dists/trunk/live-helper/data/debian-cd/
Modified:
dists/trunk/live-helper/helpers/lh_binary_debian-installer
dists/trunk/live-helper/helpers/lh_clean
dists/trunk/live-helper/manpages/lh_clean.de.1
dists/trunk/live-helper/manpages/lh_clean.en.1
Log:
Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-06-13 21:13:00 UTC (rev 2079)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-06-14 09:21:33 UTC (rev 2080)
@@ -55,12 +55,12 @@
case "${LIVE_BINARY_IMAGES}" in
iso)
DESTDIR="binary/install"
- DESTDIR_INSTALLER="cdrom"
+ DI="cdrom"
;;
net)
DESTDIR="tftpboot"
- DESTDIR_INSTALLER="netboot"
+ DI="netboot"
Echo_error "Not supported yet (FIXME)"
exit 1
@@ -80,7 +80,7 @@
DESTDIR="binary/install"
fi
- DESTDIR_INSTALLER="hd-media"
+ DI="hd-media"
;;
esac
@@ -106,92 +106,48 @@
fi
fi
-# Downloading debian-installer
-mkdir -p "${DESTDIR}"
+VMLINUZ_DI="vmlinuz"
+INITRD_DI="initrd.gz"
+DESTDIR_DI="${DESTDIR}"
+VMLINUZ_GI="gtk/vmlinuz"
+INITRD_GI="gtk/initrd.gz"
+DESTDIR_GI="${DESTDIR}/gtk"
+
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ]
then
if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- wget --no-clobber -O "${DESTDIR}"/vmlinuz.di "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrddi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
- else
- wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
- fi
- else
- wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+ VMLINUZ_DI="vmlinuz.di"
+ INITRD_DI="initrddi.gz"
+ DESTDIR_DI="${DESTDIR}"
+
+ VMLINUZ_GI="vmlinuz.gi"
+ INITRD_GI="initrdgi.gz"
+ DESTDIR_GI="${DESTDIR}"
fi
-else
- wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
fi
+# Downloading debian-installer
+mkdir -p "${DESTDIR_DI}"
+wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/vmlinuz
+wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
+
# Downloading graphical-installer
if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
then
- # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
- then
- if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
- then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- wget --no-clobber -O "${DESTDIR}"/vmlinuz.gi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/initrdgi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- else
- mkdir -p "${DESTDIR}"/gtk
-
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- fi
- else
- mkdir -p "${DESTDIR}"/gtk
-
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- fi
- else
- mkdir -p "${DESTDIR}"/gtk
-
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
- fi
+ mkdir -p "${DESTDIR_GI}"
+ wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/initrd.gz
fi
-# Downloading udebs
-mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
-gunzip -c Packages.gz > Packages
-cd "${OLDPWD}"
-
-for DISTRIBUTION in frozen stable testing unstable
-do
- ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-done
-
-DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
-UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
-
-for UDEB in ${UDEBS}
-do
- mkdir -p binary/`dirname ${UDEB}`
- cd binary/`dirname ${UDEB}`
- wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
- cd "${OLDPWD}"
-done
-
-# Downloading debs
+# Including base debian packages
if [ -d cache/packages_bootstrap ]
then
for FILE in cache/packages_bootstrap/*.deb
do
- SOURCE="`dpkg -f ${FILE} Source`"
+ SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
if [ -z "${SOURCE}" ]
then
@@ -216,77 +172,74 @@
done
fi
+# Generating indices
mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
+cd binary
+apt-ftparchive packages pool/main > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages
+gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages.gz
+#apt-ftparchive sources pool/main > dists/${LIVE_DISTRIBUTION}/main/source/Sources
+#gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/source/Sources > dists/${LIVE_DISTRIBUTION}/main/source/Sources
+cd "${OLDPWD}"
+
+# Writing release
cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
-Archive: ${LIVE_DISTRIBUTION}
+Archive: stable
+Version: 4.0r0
Component: main
Origin: Debian
Label: Debian
Architecture: ${LIVE_ARCHITECTURE}
EOF
-mkdir -p cache/indices_debian-installer
+#cat > binary/dists/${LIVE_DISTRIBUTION}/main/source/Release << EOF
+#Archive: stable
+#Version: 4.0r0
+#Component: main
+#Origin: Debian
+#Label: Debian
+#Architecture: source
+#EOF
-cat > cache/indices_debian-installer/archive << EOF
-Dir
-{
- ArchiveDir "binary";
- // OverrideDir "";
- // CacheDir "";
- FileListDir "cache/indices_debian-installer";
-};
+# Downloading udebs
+mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+gunzip -c Packages.gz > Packages
+cd "${OLDPWD}"
-Default
-{
- Packages::Compress ". gzip";
- // Packages::Extension ".deb";
- // Sources::Extensions ".dsc";
- // Contents::Compress "gzip";
- // DeLinkLimit "0";
- // FileMode "0644";
-};
+# Sorting udebs
+DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
+UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
-TreeDefault
-{
- // MaxContentsChange
- // ContentsAge
- Directory "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/";
- Packages "dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
- InternalPrefix "dists/\$(DIST)/\$(SECTION)/";
- Contents "dists/\$(DIST)/Contents-\$(ARCH)";
- // Contents::Header
- // BinCacheDB "cache.\$(DIST).\$(SECTION).\$(ARCH)";
- // FileList "filelist.\$(DIST).\$(SECTION).\$(ARCH)";
- FileList "filelist";
- // BinOverride "override.\$(DIST).\$(SECTION)";
-};
+for UDEB in ${UDEBS}
+do
+ mkdir -p binary/`dirname ${UDEB}`
+ cd binary/`dirname ${UDEB}`
+ wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+ cd "${OLDPWD}"
+done
-tree "${LIVE_DISTRIBUTION}"
-{
- Sections "main";
- Architectures "${LIVE_ARCHITECTURE}";
-};
-EOF
+# Generating release file
+apt-ftparchive \
+ -o APT::FTPArchive::Release::Origin="Debian" \
+ -o APT::FTPArchive::Release::Label="Debian" \
+ -o APT::FTPArchive::Release::Suite="${LIVE_DISTRIBUTION}" \
+ -o APT::FTPArchive::Release::Version="4.0" \
+ -o APT::FTPArchive::Release::Codename="${LIVE_DISTRIBUTION}" \
+ -o APT::FTPArchive::Release::Date="`date -R`" \
+ -o APT::FTPArchive::Release::Architectures="${LIVE_ARCHITECTURE}" \
+ -o APT::FTPArchive::Release::Components="main" \
+ -o APT::FTPArchive::Release::Description="Last updated: `date -R`" \
+release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
-cd binary
-find pool -name "*.deb" | sort > ../cache/indices_debian-installer/filelist
-cd "${OLDPWD}"
+# Creating dist symlinks
+for DISTRIBUTION in frozen stable testing unstable
+do
+ ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+done
-cat > cache/indices_debian-installer/release << EOF
-APT::FTPArchive::Release::Origin "Debian";
-APT::FTPArchive::Release::Label "Debian";
-APT::FTPArchive::Release::Suite "${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Version "4.0";
-APT::FTPArchive::Release::Codename "${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Date "`date -R`";
-APT::FTPArchive::Release::Architectures "${LIVE_ARCHITECTURE}";
-APT::FTPArchive::Release::Components "main";
-EOF
-
-apt-ftparchive generate cache/indices_debian-installer/archive
-apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
-
+# Creating disk info
mkdir binary/.disk
echo "main" > binary/.disk/base_components
touch binary/.disk/base_installable
Modified: dists/trunk/live-helper/helpers/lh_clean
===================================================================
--- dists/trunk/live-helper/helpers/lh_clean 2007-06-13 21:13:00 UTC (rev 2079)
+++ dists/trunk/live-helper/helpers/lh_clean 2007-06-14 09:21:33 UTC (rev 2080)
@@ -20,7 +20,7 @@
# Setting static variables
DESCRIPTION="clean up system build directories"
HELP=""
-USAGE="${PROGRAM} [all|cache|chroot|binary|lock|purge|stage|source]"
+USAGE="${PROGRAM} [all|cache|chroot|binary|purge|stage|source]"
Arguments "${@}"
@@ -32,11 +32,12 @@
Read_conffile config/source
Set_defaults
+rm -f .lock
+
case "${1}" in
all)
"${0}" chroot
"${0}" binary
- "${0}" lock
"${0}" stage
"${0}" source
@@ -85,10 +86,6 @@
rm -f .stage/binary*
;;
- lock)
- rm -f .lock
- ;;
-
purge)
PURGE="true" "${0}" all
"${0}" cache
Modified: dists/trunk/live-helper/manpages/lh_clean.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_clean.de.1 2007-06-13 21:13:00 UTC (rev 2079)
+++ dists/trunk/live-helper/manpages/lh_clean.de.1 2007-06-14 09:21:33 UTC (rev 2080)
@@ -5,7 +5,7 @@
.SH SYNOPSIS
.B lh_clean [\fIlive\-helper\ Optionen\fR\|]
-.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
+.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
.SH BESCHREIBUNG
lh_clean ist ein live\-helper\-Program das daf\[:u]r verwantwortlich ist, nach dem Bauen eines Live-Systemes das Build-Verzeichnis aufzur\[:a]umen. Es entfernt das Build-Verzeichnis und auch alle anderen Dateien, inklusive den Stage-Dateien die von einem live\-helper-Programm hinterlassen worden ist.
@@ -13,15 +13,13 @@
.SH OPTIONEN
Die folgenden Optionen werden von lh_clean unterst\[:u]tzt.
.IP "\fBall\fR" 4
-entfernt chroot, binary, lock, stage und source. Das ist die Standardoperation.
+entfernt chroot, binary, stage und source. Das ist die Standardoperation.
.IP "\fBcache\fR" 4
entfernt alle cache-Verzeichnisse.
.IP "\fBchroot\fR" 4
entbindet und entfernt das chroot-Verzeichnis. Wenn ein Cache von bootstrap verf\[:u]gbar ist, wird chroot auf diese Stufe zur\[:u]ck gesetzt.
.IP "\fBbinary\fR" 4
entfernt alle Caches, Verzeichnisse und Stage-Dateien der Binary-Stufe.
-.IP "\fBlock\fR" 4
-entfernt alle lock-Dateien.
.IP "\fBpurge\fR" 4
entfernt alles (inlusive cache) ausser config.
.IP "\fBstage\fR" 4
Modified: dists/trunk/live-helper/manpages/lh_clean.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_clean.en.1 2007-06-13 21:13:00 UTC (rev 2079)
+++ dists/trunk/live-helper/manpages/lh_clean.en.1 2007-06-14 09:21:33 UTC (rev 2080)
@@ -5,7 +5,7 @@
.SH SYNOPSIS
.B lh_clean [\fIlive\-helper\ options\fR\|]
-.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
+.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
.SH DESCRIPTION
lh_clean is a live\-helper program that is responsible for cleaning up after a system is built. It removes the system build directories, and removes some other files including stage files, and any detritus left behind by other live\-helper commands.
@@ -13,15 +13,13 @@
.SH OPTIONS
The following command line options are supported by lh_clean.
.IP "\fBall\fR" 4
-removes chroot, binary, lock, stage, and source. This is the default operation.
+removes chroot, binary, stage, and source. This is the default operation.
.IP "\fBcache\fR" 4
removes all cache directories.
.IP "\fBchroot\fR" 4
unmounts and removes the chroot directory. If bootstrap cache is available, the system is reset to bootstrap stage.
.IP "\fBbinary\fR" 4
removes all binary related caches, directories, and stages files.
-.IP "\fBlock\fR" 4
-removes all lock files.
.IP "\fBpurge\fR" 4
removes everything (including cache) but config.
.IP "\fBstage\fR" 4
More information about the Debian-live-changes
mailing list