Adding live-package 0.99.15-1.

This commit is contained in:
Daniel Baumann 2007-09-23 10:04:37 +02:00
parent f5e26be700
commit 782da921f8
29 changed files with 85 additions and 64 deletions

View File

@ -1,3 +1,17 @@
2007-01-16 Daniel Baumann <daniel@debian.org>
* Switched default distribution back to unstable, as unstable is usable
again from the kernel point of view.
* Added file to the minimal package list.
2007-01-04 Daniel Baumann <daniel@debian.org>
* Added workaround for new xorg packages by including
xserver-xorg-input-all and xserver-xorg-video-all in all X11 package
lists. See #405639 for more information.
* Added xdebconfigurator to all X11 package lists.
* Adding workaround for initrd backup files.
2006-11-05 Daniel Baumann <daniel@debian.org>
* Applied patch from Markus Bauer <bauer-markus@web.de>:

12
debian/changelog vendored
View File

@ -1,11 +1,11 @@
live-package (0.99.14-4) testing; urgency=medium
live-package (0.99.15-1) unstable; urgency=low
* 02defaults.sh: Updated kernel flavours to match etch.
* 14chroot.sh: Removed xorg hack, not needed in etch.
* 14chroot.sh: Fixed misspelling of aptitude.
* main.sh: Updated release codenames to match etch.
* New upstream release:
- switched default distribution back to unstable, as unstable is usable
again from the kernel point of view (Closes: #400457).
- added file to the minimal package list (Closes: #400485).
-- Daniel Baumann <daniel@debian.org> Thu, 8 Mar 2007 10:55:00 +0100
-- Daniel Baumann <daniel@debian.org> Tue, 16 Jan 2007 21:24:00 +0100
live-package (0.99.14-3) unstable; urgency=high

2
debian/compat vendored
View File

@ -1 +1 @@
4
5

6
debian/control vendored
View File

@ -3,12 +3,12 @@ Section: misc
Priority: optional
Maintainer: Debian Live <debian-live-devel@lists.alioth.debian.org>
Uploaders: Daniel Baumann <daniel@debian.org>, Marco Amadori <marco.amadori@gmail.com>
Build-Depends: debhelper (>= 4)
Build-Depends: debhelper (>= 5)
Standards-Version: 3.7.2
Package: live-package
Architecture: all
Depends: cdebootstrap (>= 0.3.15), genext2fs, mkisofs, squashfs-tools
Depends: cdebootstrap, genext2fs, genisoimage, squashfs-tools
Provides: make-live
Description: utility to build Debian Live systems
make-live is a utility to build Debian Live systems. It takes a Debian mirror
@ -16,4 +16,4 @@ Description: utility to build Debian Live systems
tarball for netboot). make-live is still in the early stage of development, but
has basic functionality and can be run successfully.
.
Homepage: <http://live.debian.net/>
Homepage: <http://debian-live.alioth.debian.org/>

6
debian/copyright vendored
View File

@ -1,15 +1,15 @@
This package was debianized by Daniel Baumann <daniel@debian.org> on
Mon, 17 Jul 2006 00:00:00 +0200.
It was downloaded from <http://live.debian.net/>.
It was downloaded from <http://debian-live.alioth.debian.org/>.
Copyright Holders: Daniel Baumann <daniel@debian.org>,
Marco Amadori <marco.amadori@gmail.com>.
License:
Copyright (C) 2006 Daniel Baumann <daniel@debian.org>
Copyright (C) 2006 Marco Amadori <marco.amadori@gmail.com>
Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
Copyright (C) 2006-2007 Marco Amadori <marco.amadori@gmail.com>
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

2
debian/rules vendored
View File

@ -4,7 +4,7 @@
#export DH_VERBOSE=1
upstream: # Needs svn
cd .. && svn co svn://live.debian.net/live-package || exit 0
cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-package || exit 0
find . -type d -name .svn -exec rm -rf {} \; || exit 0
build:

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -12,4 +12,4 @@ gnome-themes-extras
rhythmbox synaptic
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome-core - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -9,4 +9,4 @@ console-common locales
# GNOME Core
gdm gnome-core
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome-full - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -9,4 +9,4 @@ console-common locales
# GNOME Full
gdm gnome
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core

View File

@ -1,13 +1,13 @@
# /usr/share/make-live/lists/x11-core - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
# X11
wdm x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
wdm x-window-system-core
# GNUstep
gnustep gnumail.app talksoup.app viewpdf.app wmaker gnustep-icons

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -9,4 +9,4 @@ console-common locales
# KDE
kde kdm
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-core - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -9,4 +9,4 @@ console-common locales
# KDE Core
kde-core kdm
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-core-i18n - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE Core
kde-core kdm
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-extra - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -9,7 +9,7 @@ console-common locales
# KDE
kde kdm
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core
# KDE Full
koffice

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-extra-i18n - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE
kde kdm
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-full - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -9,7 +9,7 @@ console-common locales
# KDE
kde kdm
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core
# KDE Full
koffice

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-full-i18n - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE
kde kdm
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-i18n - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
# KDE
kde kdm
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core
# KDE i18n
kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br

View File

@ -1,4 +1,4 @@
# /usr/share/make-live/lists/minimal - package list for make-live(1)
# Minimal
eject vim-tiny sudo
eject file sudo vim-tiny

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/minimal-net - package list for make-live(1)
# Minimal
eject vim-tiny sudo
eject file sudo vim-tiny
# Network
bind9-host dhcp-client dnsutils ftp ifupdown iptables iputils-ping mtr-tiny

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/standard - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/standard-i18n - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales

View File

@ -1,10 +1,10 @@
# /usr/share/make-live/lists/x11 - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
# X11
xdm x-window-system xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
xdm x-window-system

View File

@ -1,10 +1,10 @@
# /usr/share/make-live/lists/x11-core - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
# X11
xdm x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
xdm x-window-system-core

View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/xfce - package list for make-live(1)
# Minimal
eject sudo
eject file sudo vim-tiny
# Standard
console-common locales
@ -9,4 +9,4 @@ console-common locales
# Xfce
gdm xfce4
x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
x-window-system-core

View File

@ -30,9 +30,9 @@ CONFIG="/etc/make-live.conf"
PROGRAM="`basename ${0}`"
VERSION="0.99.14"
CODENAME_OLDSTABLE="sarge"
CODENAME_STABLE="etch"
CODENAME_TESTING="lenny"
CODENAME_OLDSTABLE="woody"
CODENAME_STABLE="sarge"
CODENAME_TESTING="etch"
CODENAME_UNSTABLE="sid"
# Source sub scripts

View File

@ -53,7 +53,7 @@ Defaults ()
# Set debian distribution
if [ -z "${LIVE_DISTRIBUTION}" ]
then
LIVE_DISTRIBUTION="testing"
LIVE_DISTRIBUTION="unstable"
fi
if [ "${LIVE_DISTRIBUTION}" = "experimental" ]
@ -86,7 +86,13 @@ Defaults ()
;;
amd64)
LIVE_KERNEL="amd64"
if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \
[ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ]
then
LIVE_KERNEL="amd64"
else
LIVE_KERNEL="amd64-generic"
fi
;;
arm)
@ -99,7 +105,8 @@ Defaults ()
;;
i386)
if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ]
if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] || \
[ "${LIVE_DISTRIBUTION}" = "stable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_STABLE}" ]
then
LIVE_KERNEL="386"
else

View File

@ -156,6 +156,9 @@ Chroot ()
Chroot_exec "${LIVE_HOOK}"
fi
# Temporary hacks for broken packages
Hack_xorg
# Add filesystem.manifest
Chroot_exec "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest

View File

@ -215,20 +215,17 @@ Syslinux ()
Linuximage ()
{
# Removing initrd backup files
rm -f "${LIVE_CHROOT}"/boot/initrd*bak*
case "${1}" in
iso)
# Copy linux-image
if [ "${LIVE_FLAVOUR}" = "minimal" ]
then
mv "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
mv "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
mv "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
mv "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
rm -f "${LIVE_CHROOT}"/vmlinuz "${LIVE_CHROOT}"/initrd.img
else
cp "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
cp "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
cp "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
cp "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
fi
;;
@ -236,10 +233,10 @@ Linuximage ()
# Copy linux-image
if [ "${LIVE_FLAVOUR}" = "minimal" ]
then
mv "${LIVE_ROOT}"/chroot/boot/vmlinuz-* "${LIVE_ROOT}"/tftpboot/vmlinuz
mv "${LIVE_ROOT}"/chroot/boot/initrd.img-* "${LIVE_ROOT}"/tftpboot/initrd.gz
mv "${LIVE_ROOT}"/chroot/boot/vmlinuz* "${LIVE_ROOT}"/tftpboot/vmlinuz
mv "${LIVE_ROOT}"/chroot/boot/initrd.img* "${LIVE_ROOT}"/tftpboot/initrd.gz
else
cp "${LIVE_ROOT}"/chroot/boot/vmlinuz-* "${LIVE_ROOT}"/tftpboot/vmlinuz
cp "${LIVE_ROOT}"/chroot/boot/vmlinuz* "${LIVE_ROOT}"/tftpboot/vmlinuz
cp "${LIVE_ROOT}"/chroot/boot/initrd.img-* "${LIVE_ROOT}"/tftpboot/initrd.gz
fi
;;