manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding live-package 0.99.7-1.

This commit is contained in:
Daniel Baumann 2007-09-23 10:04:23 +02:00
parent d80c8552b6
commit 4a99263706
26 changed files with 75 additions and 34 deletions

1
AUTHORS
View File

@ -6,5 +6,6 @@ Main Authors:
Patches (alphabetical order):
* Alex Owen <r.a.owen@qmul.ac.uk>
* Bas Wijnen <wijnen@debian.org>
* Frederic Lehobey <Frederic.Lehobey@free.fr>
* Jason D. Clinton <me@jasonclinton.com>

21
ChangeLog
View File

@ -1,3 +1,24 @@
2006-09-25 Daniel Baumann <daniel@debian.org>
* Removed now unused initramfs-tools hack.
* Simplified xorg check based on distribution rather than version.
* Added fix from Bas Wijnen <wijnen@debian.org> for space handling in
arguments.
* Fixed package list handling similar to the fix suggested by Alex Owen
<r.alex.owen@gmail.com>.
2006-09-08 Marco Amadori <marco.amadori@gmail.com>
* 13hack.sh: initramfs-tools hack, check added for xorg.
2006-09-15 Daniel Baumann <daniel@debian.org>
* Added eject to minimal package selection.
2006-09-14 Daniel Baumann <daniel@debian.org>
* Adjustements for linux 2.6.17 testing propagation.
2006-09-08 Marco Amadori <marco.amadori@gmail.com>
* 23net.sh: Fixed binary missing directory creation.

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
live-package (0.99.7-1) unstable; urgency=medium
* New upstream release:
- removes the now outdated handling of testing specific kernels
(Closes: #387562).
- added fix from Bas Wijnen <wijnen@debian.org> for space handling in
arguments (Closes: #388204).
- fixes package list handling similar to the fix suggested by Alex Owen
<r.alex.owen@gmail.com> (Closes: #388060).
-- Daniel Baumann <daniel@debian.org> Mon, 18 Sep 2006 00:00:00 +0200
live-package (0.99.6-1) unstable; urgency=medium
* New upstream release:

2
src/lists/gnome
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/gnome-core
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome-core - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/gnome-full
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome-full - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/kde
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/kde-core
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-core - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/kde-core-i18n
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-core-i18n - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/kde-extra
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-extra - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/kde-extra-i18n
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-extra-i18n - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/kde-full
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-full - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/kde-full-i18n
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-full-i18n - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/kde-i18n
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-i18n - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/minimal
View File

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

2
src/lists/standard
View File

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

2
src/lists/standard-i18n
View File

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

2
src/lists/x11
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/x11 - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/x11-core
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/x11-core - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

2
src/lists/xfce
View File

@ -1,7 +1,7 @@
# /usr/share/make-live/lists/xfce - package list for make-live(8)
# Minimal
sudo
eject sudo
# Standard
locales

4
src/main.sh
View File

@ -28,7 +28,7 @@ set -e
BASE="/usr/share/make-live"
CONFIG="/etc/make-live.conf"
PROGRAM="`basename ${0}`"
VERSION="0.99.6"
VERSION="0.99.7"
CODENAME_OLDSTABLE="woody"
CODENAME_STABLE="sarge"
@ -158,7 +158,7 @@ Configuration ()
Main ()
{
ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- ${@}`"
ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- "${@}"`"
if [ "${?}" != "0" ]
then

19
src/scripts/02defaults.sh
View File

@ -107,7 +107,7 @@ Defaults ()
;;
amd64)
if [ "${LIVE_DISTRIBUTION}" = "unstable" ]
if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "testing" ]
then
LIVE_KERNEL="amd64"
else
@ -176,19 +176,22 @@ Defaults ()
# Check for package lists
if [ -z "${LIVE_PACKAGE_LIST}" ]
then
LIVE_PACKAGE_LIST="${BASE}/lists/standard"
else
if [ "${LIVE_FLAVOUR}" = "minimal" ]
then
LIVE_PACKAGE_LIST="${BASE}/lists/minimal"
fi
if [ -r "${BASE}/lists/${LIVE_PACKAGE_LIST}" ]
then
LIVE_PACKAGE_LIST="${BASE}/lists/${LIVE_PACKAGE_LIST}"
else
LIVE_PACKAGE_LIST="${BASE}/lists/standard"
fi
else
if [ ! -r "${LIVE_PACKAGE_LIST}" ]
then
if [ -r "${BASE}/lists/${LIVE_PACKAGE_LIST}" ]
then
LIVE_PACKAGE_LIST="${BASE}/lists/${LIVE_PACKAGE_LIST}"
else
LIVE_PACKAGE_LIST="${BASE}/lists/standard"
fi
fi
fi
# Set debian sections

3
src/scripts/13hack.sh
View File

@ -11,7 +11,8 @@
Hack_xorg ()
{
if [ -f "${LIVE_CHROOT}/etc/X11/xorg.conf" ] #&& [ "${LIVE_DISTRIBUTION_EXPERIMENTAL}" != "yes" ]
# xserver-xorg << 7.1
if [ -f "${LIVE_CHROOT}/etc/X11/xorg.conf" ] && [ "${LIVE_DISTRIBUTION}" = "testing" ]
then
# Comment "BusID" line and set driver to "vesa"
sed -i -e 's/\(^.*BusID.*\)/#\1/g' -e '/Section "Device"/,/EndSection/ s/\(.*Driver.*"\).*\(".*\)/\1vesa\2/g' "${LIVE_CHROOT}"/etc/X11/xorg.conf

4
src/scripts/21image.sh
View File

@ -32,8 +32,6 @@ Indices ()
testing)
echo "deb ${LIVE_MIRROR} testing ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb-src ${LIVE_MIRROR} testing ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb ${LIVE_MIRROR} testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb-src ${LIVE_MIRROR} testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb ${LIVE_MIRROR_SECURITY} testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb-src ${LIVE_MIRROR_SECURITY} testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
;;
@ -77,8 +75,6 @@ EOF
testing)
echo "deb http://ftp.debian.org/debian/ testing ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb-src http://ftp.debian.org/debian/ testing ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb http://ftp.debian.org/debian/ testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb-src http://ftp.debian.org/debian/ testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb http://security.debian.org/ testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
echo "deb-src http://security.debian.org/ testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
;;

5
src/scripts/22iso.sh
View File

@ -14,7 +14,10 @@ Iso ()
if [ ! -f "${LIVE_ROOT}"/.stage/image_binary ]
then
mkdir -p "${LIVE_ROOT}"/binary/casper
mv "${LIVE_ROOT}"/filesystem.manifest* "${LIVE_ROOT}"/binary/casper/
for manifest in "${LIVE_ROOT}"/filesystem.manifest*
do
mv "${manifest}" "${LIVE_ROOT}"/binary/casper/
done
# Switching package indices to default
if [ "${LIVE_GENERIC_INDICES}" = "yes" ]

6
src/scripts/23net.sh
View File

@ -15,7 +15,11 @@ Net ()
then
mkdir -p "${LIVE_ROOT}"/binary/casper
cp -r "${LIVE_TEMPLATES}"/common/* "${LIVE_ROOT}"/binary
mv "${LIVE_ROOT}"/filesystem.manifest* "${LIVE_ROOT}"/binary/casper
for manifest in "${LIVE_ROOT}"/filesystem.manifest*
do
mv "${manifest}" "${LIVE_ROOT}"/binary/casper/
done
# Installing smbfs
Chroot_exec "apt-get install --yes smbfs"