From dd853aa5d93df297f0ed03cc980749dfddfb292f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Wed, 7 Sep 2011 15:10:09 +0200
Subject: Renaming forgotten lb_binary_local-packagelists to
 lb_binary_packagelists.

---
 scripts/build/lb_binary                    |   2 +-
 scripts/build/lb_binary_local-packagelists | 131 -----------------------------
 scripts/build/lb_binary_packagelists       | 131 +++++++++++++++++++++++++++++
 3 files changed, 132 insertions(+), 132 deletions(-)
 delete mode 100755 scripts/build/lb_binary_local-packagelists
 create mode 100755 scripts/build/lb_binary_packagelists

(limited to 'scripts')

diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index 1649587b2..0598a848d 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -58,7 +58,7 @@ lb binary_rootfs ${*}
 lb binary_manifest ${*}
 
 # Prepare images
-lb binary_local-packagelists ${*}
+lb binary_packagelists ${*}
 lb binary_linux-image ${*}
 lb binary_debian-installer ${*}
 lb binary_memtest ${*}
diff --git a/scripts/build/lb_binary_local-packagelists b/scripts/build/lb_binary_local-packagelists
deleted file mode 100755
index 27e2daeb6..000000000
--- a/scripts/build/lb_binary_local-packagelists
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
-##
-## live-build 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
-
-# Including common functions
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'install local packages into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin installing local package lists..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_local-packagelists
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/package-lists/*.list > /dev/null 2>&1 || \
-   ls config/package-lists/*.list.binary > /dev/null 2>&1
-then
-	# Restoring cache
-	Restore_cache cache/packages_chroot
-
-	# Check depends
-	Check_package chroot/usr/bin/apt-ftparchive apt-utils
-
-	# Installing depends
-	Install_package
-
-	mkdir -p chroot/binary.deb/archives/partial
-	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
-	touch chroot/var/lib/dpkg/status
-
-	for LIST in config/package-lists/*.list \
-		    config/package-lists/*.list.binary
-	do
-		# Generate package list
-		Expand_packagelist "${LIST}" "config/package-lists" > chroot/root/"$(basename ${LIST})"
-
-		# Downloading additional packages
-		Chroot chroot "xargs --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
-
-		# Remove package list
-		rm chroot/root/"$(basename ${LIST})"
-	done
-
-	for FILE in chroot/binary.deb/archives/*.deb
-	do
-		SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
-		SECTION="$(dpkg -f ${FILE} Section | awk '{ print $1 }')"
-
-		if [ -z "${SOURCE}" ]
-		then
-			SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
-		fi
-
-		case "${SOURCE}" in
-			lib?*)
-				LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
-				;;
-
-			*)
-				LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
-				;;
-		esac
-
-		if echo "${SECTION}" | grep -qs contrib
-		then
-			SECTION="contrib"
-		elif echo "${SECTION}" | grep -qs non-free
-		then
-			SECTION="non-free"
-		else
-			SECTION="main"
-		fi
-
-		# Install directory
-		mkdir -p binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}"
-
-		# Move files
-		mv "${FILE}" binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}"
-	done
-
-	cd binary
-
-	for SECTION in pool/*
-	do
-		SECTION="$(basename ${SECTION})"
-
-		mkdir -p dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}
-		apt-ftparchive packages pool/${SECTION} > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages
-		gzip -9 -c dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz
-	done
-
-	cd "${OLDPWD}"
-
-	rm -rf chroot/binary.deb
-	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
-
-	# Removing depends
-	Remove_package
-
-	# Saving cache
-	Save_cache cache/packages_chroot
-
-	# Creating stage file
-	Create_stagefile .stage/binary_local-packagelists
-fi
diff --git a/scripts/build/lb_binary_packagelists b/scripts/build/lb_binary_packagelists
new file mode 100755
index 000000000..5f2c64ba9
--- /dev/null
+++ b/scripts/build/lb_binary_packagelists
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
+
+# Including common functions
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'install local packages into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin installing local package lists..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_packagelists
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/package-lists/*.list > /dev/null 2>&1 || \
+   ls config/package-lists/*.list.binary > /dev/null 2>&1
+then
+	# Restoring cache
+	Restore_cache cache/packages_chroot
+
+	# Check depends
+	Check_package chroot/usr/bin/apt-ftparchive apt-utils
+
+	# Installing depends
+	Install_package
+
+	mkdir -p chroot/binary.deb/archives/partial
+	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
+	touch chroot/var/lib/dpkg/status
+
+	for LIST in config/package-lists/*.list \
+		    config/package-lists/*.list.binary
+	do
+		# Generate package list
+		Expand_packagelist "${LIST}" "config/package-lists" > chroot/root/"$(basename ${LIST})"
+
+		# Downloading additional packages
+		Chroot chroot "xargs --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
+
+		# Remove package list
+		rm chroot/root/"$(basename ${LIST})"
+	done
+
+	for FILE in chroot/binary.deb/archives/*.deb
+	do
+		SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
+		SECTION="$(dpkg -f ${FILE} Section | awk '{ print $1 }')"
+
+		if [ -z "${SOURCE}" ]
+		then
+			SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
+		fi
+
+		case "${SOURCE}" in
+			lib?*)
+				LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
+				;;
+
+			*)
+				LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
+				;;
+		esac
+
+		if echo "${SECTION}" | grep -qs contrib
+		then
+			SECTION="contrib"
+		elif echo "${SECTION}" | grep -qs non-free
+		then
+			SECTION="non-free"
+		else
+			SECTION="main"
+		fi
+
+		# Install directory
+		mkdir -p binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}"
+
+		# Move files
+		mv "${FILE}" binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}"
+	done
+
+	cd binary
+
+	for SECTION in pool/*
+	do
+		SECTION="$(basename ${SECTION})"
+
+		mkdir -p dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}
+		apt-ftparchive packages pool/${SECTION} > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages
+		gzip -9 -c dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz
+	done
+
+	cd "${OLDPWD}"
+
+	rm -rf chroot/binary.deb
+	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+
+	# Removing depends
+	Remove_package
+
+	# Saving cache
+	Save_cache cache/packages_chroot
+
+	# Creating stage file
+	Create_stagefile .stage/binary_packagelists
+fi
-- 
cgit v1.2.3