[SCM] live-build branch, debian-next, updated. debian/3.0_a9-1-9-geb20283
Daniel Baumann
daniel at debian.org
Mon Dec 13 22:36:10 UTC 2010
The following commit has been merged in the debian-next branch:
commit eb2028377142d43814db8ddc97e9a41423433f91
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Dec 13 23:36:01 2010 +0100
Removing last live-helper remains in internal variables.
diff --git a/functions/exit.sh b/functions/exit.sh
index 5fa1fa8..8a97207 100755
--- a/functions/exit.sh
+++ b/functions/exit.sh
@@ -15,7 +15,7 @@ Exit ()
if [ "${_DEBUG}" = "true" ]
then
# Dump variables
- set | grep -e ^LH
+ set | grep -e ^LB
fi
# Always exit true in case we are not able to unmount
diff --git a/lists/debian-forensics b/lists/debian-forensics
index 9c0e7d7..441449d 100644
--- a/lists/debian-forensics
+++ b/lists/debian-forensics
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/debian-forensics - package list for live-build(7)
-## LH: Debian Forensics
+## LB: Debian Forensics
#include <standard>
# http://qa.debian.org/developer.php?login=forensics-devel@lists.alioth.debian.org
diff --git a/lists/debian-junior b/lists/debian-junior
index b5bf5d7..2105849 100644
--- a/lists/debian-junior
+++ b/lists/debian-junior
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/debian-junior - package list for live-build(7)
-## LH: Debian Junior
+## LB: Debian Junior
#include <standard>
# http://qa.debian.org/developer.php?login=debian-jr@lists.debian.org
diff --git a/lists/debian-live-devel b/lists/debian-live-devel
index ce26c96..aa20bfc 100644
--- a/lists/debian-live-devel
+++ b/lists/debian-live-devel
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/debian-live - package list for live-build(7)
-## LH: Debian Live
+## LB: Debian Live
#include <standard>
# http://qa.debian.org/developer.php?login=debian-live@lists.debian.org
diff --git a/lists/debian-live-pxe-server b/lists/debian-live-pxe-server
index 586f38c..b0caf44 100644
--- a/lists/debian-live-pxe-server
+++ b/lists/debian-live-pxe-server
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/debian-live-pxe-server - package list for live-build(7)
-## LH: Debian Live
+## LB: Debian Live
#include <standard>
bind9
diff --git a/lists/debian-science b/lists/debian-science
index d9da39d..9365b2f 100644
--- a/lists/debian-science
+++ b/lists/debian-science
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/debian-science - package list for live-build(7)
-## LH: Debian Science
+## LB: Debian Science
#include <standard>
# http://qa.debian.org/developer.php?login=debian-science-maintainers@lists.alioth.debian.org
diff --git a/lists/gnome b/lists/gnome
index 98b324f..8f44a2f 100644
--- a/lists/gnome
+++ b/lists/gnome
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/gnome - package list for live-build(7)
-## LH: GNOME Desktop
+## LB: GNOME Desktop
#include <gnome-core>
gnome-desktop-environment gnome-screensaver gnome-themes-extras
diff --git a/lists/gnome-core b/lists/gnome-core
index 525f4e2..fe1837a 100644
--- a/lists/gnome-core
+++ b/lists/gnome-core
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/gnome-core - package list for live-build(7)
-## LH: GNOME Core
+## LB: GNOME Core
#include <standard-x11>
gnome-core
diff --git a/lists/gnome-full b/lists/gnome-full
index 1f4c6d7..188f8d7 100644
--- a/lists/gnome-full
+++ b/lists/gnome-full
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/gnome-full - package list for live-build(7)
-## LH: GNOME full
+## LB: GNOME full
#include <gnome>
gnome
diff --git a/lists/gnome-junior b/lists/gnome-junior
index f5d4ef9..a2175cb 100644
--- a/lists/gnome-junior
+++ b/lists/gnome-junior
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/gnome-junior - package list for live-build(7)
-## LH: Debian Junior (Gnome)
+## LB: Debian Junior (Gnome)
#include <gnome>
#include <debian-junior>
diff --git a/lists/gnustep b/lists/gnustep
index 3fc0ad5..cdc7e66 100644
--- a/lists/gnustep
+++ b/lists/gnustep
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/gnustep - package list for live-build(7)
-## LH: GNUstep desktop
+## LB: GNUstep desktop
#include <standard-x11>
wdm
diff --git a/lists/kde b/lists/kde
index 3778e78..a00bcca 100644
--- a/lists/kde
+++ b/lists/kde
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/kde - package list for live-build(7)
-## LH: KDE
+## LB: KDE
#include <kde-core>
kde-standard
diff --git a/lists/kde-core b/lists/kde-core
index 68d07df..fa11669 100644
--- a/lists/kde-core
+++ b/lists/kde-core
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/kde-core - package list for live-build(7)
-## LH: KDE Core
+## LB: KDE Core
#include <standard-x11>
kde-plasma-desktop
diff --git a/lists/kde-extra b/lists/kde-extra
index a64d1db..14137cb 100644
--- a/lists/kde-extra
+++ b/lists/kde-extra
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/kde-extra - package list for live-build(7)
-## LH: KDE Extra
+## LB: KDE Extra
#include <kde-full>
kde-extras
diff --git a/lists/kde-full b/lists/kde-full
index fb44f19..057e87e 100644
--- a/lists/kde-full
+++ b/lists/kde-full
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/kde-full - package list for live-build(7)
-## LH: KDE Full
+## LB: KDE Full
#include <kde>
koffice
diff --git a/lists/kde-junior b/lists/kde-junior
index 0f79744..39c1605 100644
--- a/lists/kde-junior
+++ b/lists/kde-junior
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/kde-junior - package list for live-build(7)
-## LH: KDE Junior
+## LB: KDE Junior
#include <kde>
#include <debian-junior>
diff --git a/lists/lxde b/lists/lxde
index 9d983ce..b59f5f3 100644
--- a/lists/lxde
+++ b/lists/lxde
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/lxde - package list for live-build(7)
-## LH: LXDE
+## LB: LXDE
#include <standard-x11>
lxde
diff --git a/lists/minimal b/lists/minimal
index b3c9eea..65634c9 100644
--- a/lists/minimal
+++ b/lists/minimal
@@ -5,7 +5,7 @@
# things to make the image smaller. This can lead to breakages at any time,
# don't use it if you're not willing/capable of fixing any arising issues.
-## LH: Minimal
+## LB: Minimal
eject file user-setup sudo
diff --git a/lists/rescue b/lists/rescue
index 347a49f..8b4dff3 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/rescue - package list for live-build(7)
-## LH: Rescue
+## LB: Rescue
#include <standard>
# Debian Forensics
diff --git a/lists/standard b/lists/standard
index 4dd8a7a..d09e6b1 100644
--- a/lists/standard
+++ b/lists/standard
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/standard - package list for live-build(7)
-## LH: Standard
+## LB: Standard
#include <minimal>
console-setup console-common kbd
diff --git a/lists/standard-x11 b/lists/standard-x11
index bddc006..3faff72 100644
--- a/lists/standard-x11
+++ b/lists/standard-x11
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/standard-x11 - package list for live-build(7)
-## LH: Standard X11
+## LB: Standard X11
#include <standard>
xorg xresprobe menu
diff --git a/lists/studio b/lists/studio
index d6251f9..377cee2 100644
--- a/lists/studio
+++ b/lists/studio
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/studio - package list for live-build(7)
-## LH: Music Studio base
+## LB: Music Studio base
# packagelist inspired from the A/DeMuDi one.
#
# You don't want to use that list as a standalone list. Instead use
diff --git a/lists/studio-gnome b/lists/studio-gnome
index 0dc76b1..ec10efa 100644
--- a/lists/studio-gnome
+++ b/lists/studio-gnome
@@ -1,5 +1,5 @@
# /usr/share/live/build/lists/studio-gnome - package list for live-build(7)
-## LH: Music Studio (Gnome)
+## LB: Music Studio (Gnome)
#include <gnome>
#include <studio>
diff --git a/lists/studio-kde b/lists/studio-kde
index 5374076..611bb8c 100644
--- a/lists/studio-kde
+++ b/lists/studio-kde
@@ -1,5 +1,5 @@
# /usr/share/live/build/lists/studio-kde - package list for live-build(7)
-## LH: Music Studio (KDE)
+## LB: Music Studio (KDE)
#include <kde>
#include <studio>
diff --git a/lists/studio-xfce b/lists/studio-xfce
index c6005fb..60c157b 100644
--- a/lists/studio-xfce
+++ b/lists/studio-xfce
@@ -1,5 +1,5 @@
# /usr/share/live/build/lists/studio-xfce - package list for live-build(7)
-## LH: Music Studio (Xfce)
+## LB: Music Studio (Xfce)
#include <xfce>
#include <studio>
diff --git a/lists/xfce b/lists/xfce
index 77b807b..081ecf0 100644
--- a/lists/xfce
+++ b/lists/xfce
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/xfce - package list for live-build(7)
-## LH: Xfce
+## LB: Xfce
#include <standard-x11>
xfce4
diff --git a/lists/xfce-junior b/lists/xfce-junior
index e2bf43a..32584e1 100644
--- a/lists/xfce-junior
+++ b/lists/xfce-junior
@@ -1,6 +1,6 @@
# /usr/share/live/build/lists/xfce-junior - package list for live-build(7)
-## LH: Xfce Debian Junior
+## LB: Xfce Debian Junior
#include <xfce>
#include <debian-junior>
diff --git a/scripts/build/lb b/scripts/build/lb
index d0b10f7..f64967a 100755
--- a/scripts/build/lb
+++ b/scripts/build/lb
@@ -44,13 +44,13 @@ case "${1}" in
if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ]
then
- LH=1 exec "${LB_BASE}/scripts/build/${COMMAND}" "${@}"
+ LB=1 exec "${LB_BASE}/scripts/build/${COMMAND}" "${@}"
elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ]
then
- LH=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}"
+ LB=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}"
elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
then
- LH=1 exec "${COMMAND}" "${@}"
+ LB=1 exec "${COMMAND}" "${@}"
else
Echo_error "no such script"
exit 1
diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean
index 814a844..54fc3b3 100755
--- a/scripts/build/lb_clean
+++ b/scripts/build/lb_clean
@@ -57,10 +57,10 @@ for ARGUMENT in ${ARGUMENTS}
do
case "${ARGUMENT}" in
--all)
- LH=1 "${0}" noauto --chroot
- LH=1 "${0}" noauto --binary
- LH=1 "${0}" noauto --stage
- LH=1 "${0}" noauto --source
+ LB=1 "${0}" noauto --chroot
+ LB=1 "${0}" noauto --binary
+ LB=1 "${0}" noauto --stage
+ LB=1 "${0}" noauto --source
rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true
;;
@@ -104,13 +104,13 @@ do
;;
--remove)
- LH=1 "${0}" --all
+ LB=1 "${0}" --all
rm -rf cache/packages_*
;;
--purge)
- LH=1 "${0}" --all
- LH=1 "${0}" --cache
+ LB=1 "${0}" --all
+ LB=1 "${0}" --cache
if [ -e auto/config ]
then
--
live-build
More information about the debian-live-changes
mailing list