[Debian-live-changes] r2184 - in dists/trunk/live-helper: functions helpers lists
lamby-guest at alioth.debian.org
lamby-guest at alioth.debian.org
Mon Jun 18 20:12:16 UTC 2007
Author: lamby-guest
Date: 2007-06-18 20:12:16 +0000 (Mon, 18 Jun 2007)
New Revision: 2184
Added:
dists/trunk/live-helper/functions/package_lists.sh
dists/trunk/live-helper/lists/junior-pkgs
dists/trunk/live-helper/lists/minimal
Modified:
dists/trunk/live-helper/helpers/lh_chroot_local-packageslists
dists/trunk/live-helper/helpers/lh_chroot_packageslists
dists/trunk/live-helper/lists/gnome
dists/trunk/live-helper/lists/gnome-core
dists/trunk/live-helper/lists/gnome-full
dists/trunk/live-helper/lists/gnome-junior
dists/trunk/live-helper/lists/gnustep
dists/trunk/live-helper/lists/kde
dists/trunk/live-helper/lists/kde-core
dists/trunk/live-helper/lists/kde-extra
dists/trunk/live-helper/lists/kde-full
dists/trunk/live-helper/lists/kde-junior
dists/trunk/live-helper/lists/rescue
dists/trunk/live-helper/lists/standard
dists/trunk/live-helper/lists/standard-x11
dists/trunk/live-helper/lists/xfce
dists/trunk/live-helper/lists/xfce-junior
Log:
Adds support for '#<include> ' in package lists. Modifies existing package lists
Added: dists/trunk/live-helper/functions/package_lists.sh
===================================================================
--- dists/trunk/live-helper/functions/package_lists.sh (rev 0)
+++ dists/trunk/live-helper/functions/package_lists.sh 2007-06-18 20:12:16 UTC (rev 2184)
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# package_lists.sh - expands package list includes
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper 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
+
+Expand_package_list ()
+{
+ # ${1} List name
+ # ${2} Default path to search
+ # ${3} Fallback path to search (optional)
+
+ echo "Expand package list with ${@}"
+
+ # Does list exist in default path?
+ if [ -e "${2}/${1}" ];
+ then
+ Expand_package_list_file "${2}/${1}" "${@}"
+ else
+ # If list exists in fallback, include it.
+ if [ -n "${3}" ] && [ -e "${3}/${1}" ]
+ then
+ Expand_package_list_file "${3}/${1}" "${@}"
+ fi
+ fi
+}
+
+Expand_package_list_file ()
+{
+ local FILE="${1}"
+ shift
+ shift
+
+ for INCLUDE in `sed -ne 's/^#<include> \(.*\)/\1/gp' "${FILE}"`;
+ do
+ Expand_package_list "${INCLUDE}" "${@}"
+ done
+ sed -ne 's/^\([^#].*\)/\1\n/gp' $FILE
+}
Property changes on: dists/trunk/live-helper/functions/package_lists.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: dists/trunk/live-helper/helpers/lh_chroot_local-packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packageslists 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-packageslists 2007-06-18 20:12:16 UTC (rev 2184)
@@ -53,9 +53,9 @@
for PACKAGESLIST in config/chroot_local-packageslists/*
do
- # Copying package list
- grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`"
-
+ # Generate package list
+ Expand_package_list "`basename ${PACKAGESLIST}`" "config/chroot_local-packageslists" "${LH_BASE:-/usr/share/live-helper/lists}/lists" > chroot/root/"`basename ${PACKAGESLIST}`"
+
# Installing package list
case "${LH_APT}" in
apt|apt-get)
Modified: dists/trunk/live-helper/helpers/lh_chroot_packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packageslists 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/helpers/lh_chroot_packageslists 2007-06-18 20:12:16 UTC (rev 2184)
@@ -55,8 +55,8 @@
do
if [ -f ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" ]
then
- # Copying package list
- grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" > chroot/root/"${LIST}"
+ # Generating package list
+ Expand_package_list "${LIST}" "config/chroot_local-packageslists" "${LH_BASE:-/usr/share/live-helper}/lists" > chroot/root/${LIST}
# Installing package list
case "${LH_APT}" in
Modified: dists/trunk/live-helper/lists/gnome
===================================================================
--- dists/trunk/live-helper/lists/gnome 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/gnome 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,17 +1,9 @@
# /usr/share/live-helper/lists/gnome - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: GNOME Desktop
+#<include> gnome-core
-# Standard
-console-common kbd locales
-
-# GNOME
-gdm gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
+gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
gnome-themes-extras
-desktop-base
rhythmbox synaptic
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
Modified: dists/trunk/live-helper/lists/gnome-core
===================================================================
--- dists/trunk/live-helper/lists/gnome-core 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/gnome-core 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,14 +1,7 @@
# /usr/share/live-helper/lists/gnome-core - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: GNOME Core
+#<include> standard-x11
-# Standard
-console-common kbd locales
-
-# GNOME Core
gdm gnome-core
desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
Modified: dists/trunk/live-helper/lists/gnome-full
===================================================================
--- dists/trunk/live-helper/lists/gnome-full 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/gnome-full 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,14 +1,7 @@
# /usr/share/live-helper/lists/gnome-full - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: GNOME full
+#<include> gnome
-# Standard
-console-common kbd locales
-
-# GNOME Full
gdm gnome
desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
Modified: dists/trunk/live-helper/lists/gnome-junior
===================================================================
--- dists/trunk/live-helper/lists/gnome-junior 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/gnome-junior 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,23 +1,7 @@
-# /usr/share/live-helper/lists/gnome - package list for live-helper(7)
+# /usr/share/live-helper/lists/gnome-junior - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: Debian Junior (Gnome)
+#<include> gnome
+#<include> junior-pkgs
-# Standard
-console-common kbd locales
-
-# GNOME
-gdm gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
-gnome-themes-extras
-desktop-base
-
-rhythmbox synaptic
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
-
-# Debian Junior
-junior-sound junior-typing junior-internet junior-gnome junior-toys
-junior-games-net junior-games-sim junior-games-gl junior-puzzle junior-arcade
-junior-math junior-writing junior-games-card junior-programming junior-system
-junior-art junior-doc junior-games-text
+junior-gnome
Modified: dists/trunk/live-helper/lists/gnustep
===================================================================
--- dists/trunk/live-helper/lists/gnustep 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/gnustep 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,15 +1,8 @@
# /usr/share/live-helper/lists/gnustep - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: GNUstep desktop
+#<include> standard-x11
-# Standard
-console-common kbd locales
-
-# X11
-xorg xresprobe discover menu
-
-# GNUstep
wdm
gnustep gnumail.app talksoup.app viewpdf.app wmaker gnustep-icons
Added: dists/trunk/live-helper/lists/junior-pkgs
===================================================================
--- dists/trunk/live-helper/lists/junior-pkgs (rev 0)
+++ dists/trunk/live-helper/lists/junior-pkgs 2007-06-18 20:12:16 UTC (rev 2184)
@@ -0,0 +1,8 @@
+# /usr/share/live-helper/lists/junior-pkgs - package list for live-helper(7)
+
+## LH: Desktop agnostic packages for Debian Junior
+
+junior-sound junior-typing junior-internet junior-toys junior-games-net
+junior-games-sim junior-games-gl junior-puzzle junior-arcade junior-math
+junior-writing junior-games-card junior-programming junior-system junior-art
+junior-doc junior-games-text
Modified: dists/trunk/live-helper/lists/kde
===================================================================
--- dists/trunk/live-helper/lists/kde 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/kde 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,14 +1,7 @@
# /usr/share/live-helper/lists/kde - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: KDE
+#<include> kde-core
-# Standard
-console-common kbd locales
-
-# KDE
kde kdm
desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
Modified: dists/trunk/live-helper/lists/kde-core
===================================================================
--- dists/trunk/live-helper/lists/kde-core 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/kde-core 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,14 +1,7 @@
# /usr/share/live-helper/lists/kde-core - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: KDE Core
+#<include> standard-x11
-# Standard
-console-common kbd locales
-
-# KDE Core
kde-core kdm
desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
Modified: dists/trunk/live-helper/lists/kde-extra
===================================================================
--- dists/trunk/live-helper/lists/kde-extra 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/kde-extra 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,20 +1,6 @@
# /usr/share/live-helper/lists/kde-extra - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: KDE Extra
+#<include> kde-full
-# Standard
-console-common kbd locales
-
-# KDE
-kde kdm
-desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
-
-# KDE Full
-koffice
-
-# KDE Extra
kde-extras
Modified: dists/trunk/live-helper/lists/kde-full
===================================================================
--- dists/trunk/live-helper/lists/kde-full 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/kde-full 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,17 +1,6 @@
# /usr/share/live-helper/lists/kde-full - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: KDE Full
+#<include> kde
-# Standard
-console-common kbd locales
-
-# KDE
-kde kdm
-desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
-
-# KDE Full
koffice
Modified: dists/trunk/live-helper/lists/kde-junior
===================================================================
--- dists/trunk/live-helper/lists/kde-junior 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/kde-junior 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,20 +1,7 @@
-# /usr/share/live-helper/lists/kde - package list for live-helper(7)
+# /usr/share/live-helper/lists/kde-junior - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: KDE Junior
+#<include> kde
+#<include> junior-pkgs
-# Standard
-console-common kbd locales
-
-# KDE
-kde kdm
-desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
-
-# Debian Junior
-junior-sound junior-typing junior-internet junior-toys junior-games-net
-junior-games-sim junior-games-gl junior-puzzle junior-arcade junior-math
-junior-writing junior-games-card junior-programming junior-system junior-art
-junior-doc junior-games-text junior-kde
+junior-kde
Added: dists/trunk/live-helper/lists/minimal
===================================================================
--- dists/trunk/live-helper/lists/minimal (rev 0)
+++ dists/trunk/live-helper/lists/minimal 2007-06-18 20:12:16 UTC (rev 2184)
@@ -0,0 +1,5 @@
+# /usr/share/live-helper/lists/minimal - package list for live-helper(7)
+
+## LH: Minimal
+
+eject file sudo vim-tiny
Modified: dists/trunk/live-helper/lists/rescue
===================================================================
--- dists/trunk/live-helper/lists/rescue 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/rescue 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,15 +1,9 @@
# /usr/share/live-helper/lists/rescue - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: Rescue
+#<include> standard
-# Standard
-console-common kbd locales
-
-##### Rescue
-
## System
-
gnupg dash discover gawk grub htop lilo ltrace pstack screen strace units
## Editors
Modified: dists/trunk/live-helper/lists/standard
===================================================================
--- dists/trunk/live-helper/lists/standard 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/standard 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,7 +1,6 @@
# /usr/share/live-helper/lists/standard - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: Standard
+#<include> minimal
-# Standard
console-common kbd locales
Modified: dists/trunk/live-helper/lists/standard-x11
===================================================================
--- dists/trunk/live-helper/lists/standard-x11 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/standard-x11 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,11 +1,7 @@
# /usr/share/live-helper/lists/standard-x11 - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: Standard X11
+#<include> standard
-# Standard
-console-common kbd locales
-
-# X11
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils
Modified: dists/trunk/live-helper/lists/xfce
===================================================================
--- dists/trunk/live-helper/lists/xfce 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/xfce 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,14 +1,7 @@
# /usr/share/live-helper/lists/xfce - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: Xfce
+#<include> standard-x11
-# Standard
-console-common kbd locales
-
-# Xfce
xfce4 gdm
desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
Modified: dists/trunk/live-helper/lists/xfce-junior
===================================================================
--- dists/trunk/live-helper/lists/xfce-junior 2007-06-18 19:43:17 UTC (rev 2183)
+++ dists/trunk/live-helper/lists/xfce-junior 2007-06-18 20:12:16 UTC (rev 2184)
@@ -1,20 +1,7 @@
-# /usr/share/live-helper/lists/xfce - package list for live-helper(7)
+# /usr/share/live-helper/lists/xfce-junior - package list for live-helper(7)
-# Minimal
-eject file sudo vim-tiny
+## LH: Xfce Debian Junior
+#<include> xfce
+#<include> junior-pkgs
-# Standard
-console-common kbd locales
-
-# Xfce
-xfce4 gdm
-desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
-
-# Debian Junior
-junior-sound junior-typing junior-internet junior-gnome junior-toys
-junior-games-net junior-games-sim junior-games-gl junior-puzzle junior-arcade
-junior-math junior-writing junior-games-card junior-programming junior-system
-junior-art junior-doc junior-games-text junior-kde
+junior-kde junior-gnome
More information about the Debian-live-changes
mailing list