diff options
| -rwxr-xr-x | functions/exit.sh | 2 | ||||
| -rw-r--r-- | lists/debian-forensics | 2 | ||||
| -rw-r--r-- | lists/debian-junior | 2 | ||||
| -rw-r--r-- | lists/debian-live-devel | 2 | ||||
| -rw-r--r-- | lists/debian-live-pxe-server | 2 | ||||
| -rw-r--r-- | lists/debian-science | 2 | ||||
| -rw-r--r-- | lists/gnome | 2 | ||||
| -rw-r--r-- | lists/gnome-core | 2 | ||||
| -rw-r--r-- | lists/gnome-desktop | 2 | ||||
| -rw-r--r-- | lists/gnome-full | 2 | ||||
| -rw-r--r-- | lists/gnome-junior | 2 | ||||
| -rw-r--r-- | lists/gnustep | 2 | ||||
| -rw-r--r-- | lists/kde | 2 | ||||
| -rw-r--r-- | lists/kde-core | 2 | ||||
| -rw-r--r-- | lists/kde-desktop | 2 | ||||
| -rw-r--r-- | lists/kde-extra | 2 | ||||
| -rw-r--r-- | lists/kde-full | 2 | ||||
| -rw-r--r-- | lists/kde-junior | 2 | ||||
| -rw-r--r-- | lists/lxde | 2 | ||||
| -rw-r--r-- | lists/lxde-desktop | 2 | ||||
| -rw-r--r-- | lists/minimal | 2 | ||||
| -rw-r--r-- | lists/rescue | 2 | ||||
| -rw-r--r-- | lists/standard | 2 | ||||
| -rw-r--r-- | lists/standard-x11 | 2 | ||||
| -rw-r--r-- | lists/studio | 2 | ||||
| -rw-r--r-- | lists/studio-gnome | 2 | ||||
| -rw-r--r-- | lists/studio-kde | 2 | ||||
| -rw-r--r-- | lists/studio-xfce | 2 | ||||
| -rw-r--r-- | lists/xfce | 2 | ||||
| -rw-r--r-- | lists/xfce-desktop | 2 | ||||
| -rw-r--r-- | lists/xfce-junior | 2 | ||||
| -rwxr-xr-x | scripts/build/lb | 6 | ||||
| -rwxr-xr-x | scripts/build/lb_clean | 14 |
33 files changed, 41 insertions, 41 deletions
diff --git a/functions/exit.sh b/functions/exit.sh index 5fa1fa86f..8a9720788 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 4c7a3563e..9c40b50a7 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 b5bf5d74b..21058499f 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 fc6d8581e..46dba8251 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 91d9be58b..58cae4d21 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 d9da39d60..9365b2fd0 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 d003a38ed..7c8dcb96a 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> #if DISTRIBUTION lenny diff --git a/lists/gnome-core b/lists/gnome-core index faa77744a..5306ed5df 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-desktop b/lists/gnome-desktop index bcec0ecf2..4ba619346 100644 --- a/lists/gnome-desktop +++ b/lists/gnome-desktop @@ -1,6 +1,6 @@ # /usr/share/live/build/lists/gnome-desktop - package list for live-build(7) -## LH: GNOME Desktop +## LB: GNOME Desktop # This is a virtual package list, equivalent to: # lb config --packages-lists standard-x11 --tasks "gnome-desktop desktop standard laptop" diff --git a/lists/gnome-full b/lists/gnome-full index bd717cff0..a5e741f74 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 f5d4ef994..a2175cbc7 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 3fc0ad5aa..cdc7e6670 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 @@ -1,6 +1,6 @@ # /usr/share/live/build/lists/kde - package list for live-build(7) -## LH: KDE +## LB: KDE #include <kde-core> #if DISTRIBUTION lenny diff --git a/lists/kde-core b/lists/kde-core index 174eeb650..2464a743d 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> #if DISTRIBUTION lenny diff --git a/lists/kde-desktop b/lists/kde-desktop index e55140532..642f02119 100644 --- a/lists/kde-desktop +++ b/lists/kde-desktop @@ -1,6 +1,6 @@ # /usr/share/live/build/lists/kde-desktop - package list for live-build(7) -## LH: KDE Desktop +## LB: KDE Desktop # This is a virtual package list, equivalent to: # lb config --packages-lists standard-x11 --tasks "kde-desktop desktop standard laptop" diff --git a/lists/kde-extra b/lists/kde-extra index a64d1db68..14137cbc0 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 b375ee21e..139057254 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> #if DISTRIBUTION lenny diff --git a/lists/kde-junior b/lists/kde-junior index 0f79744c7..39c1605aa 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 3884bfd15..8d9323e9c 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/lxde-desktop b/lists/lxde-desktop index eb18c5fd9..4d9ddd61d 100644 --- a/lists/lxde-desktop +++ b/lists/lxde-desktop @@ -1,6 +1,6 @@ # /usr/share/live/build/lists/lxde-desktop - package list for live-build(7) -## LH: LXDE Desktop +## LB: LXDE Desktop # This is a virtual package list, equivalent to: # lb config --packages-lists standard-x11 --tasks "lxde-desktop desktop standard laptop" diff --git a/lists/minimal b/lists/minimal index 6a48fa44d..c5eeb5430 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 04acaf25f..8a70464b7 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 4dd8a7a6a..d09e6b10c 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 1f76f058d..8addbb8e3 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 f7e4e5fad..48fb90e0a 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 0dc76b1e0..ec10efa3e 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 537407643..611bb8ca0 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 c6005fb2c..60c157b64 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 86561a838..67e0e2555 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-desktop b/lists/xfce-desktop index cdde22b56..4b226da4b 100644 --- a/lists/xfce-desktop +++ b/lists/xfce-desktop @@ -1,6 +1,6 @@ # /usr/share/live/build/lists/xfce-desktop - package list for live-build(7) -## LH: XFCE Desktop +## LB: XFCE Desktop # This is a virtual package list, equivalent to: # lb config --packages-lists standard-x11 --tasks "xfce-desktop desktop standard laptop" diff --git a/lists/xfce-junior b/lists/xfce-junior index e2bf43a55..32584e149 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 d0b10f73e..f64967ab1 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 814a844b9..54fc3b37c 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 |