[Debian-live-changes] r2272 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-28 19:40:48 +0000 (Thu, 28 Jun 2007)
New Revision: 2272

Modified:
   dists/trunk/live-helper/helpers/lh_binary_debian-installer
   dists/trunk/live-helper/helpers/lh_config
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-06-28 15:26:42 UTC (rev 2271)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-06-28 19:40:48 UTC (rev 2272)
@@ -221,6 +221,36 @@
 	done
 fi
 
+# Including local debs
+if ls ../config/binary_local-debs/* &> /dev/null
+then
+	for FILE in ../config/binary_local-debs/*.deb
+	do
+		SOURCE="`dpkg -f ${FILE} Source | 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
+
+		# Install directory
+		mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Move files
+		cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+	done
+fi
+
 # Generating deb indices
 mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
 

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-06-28 15:26:42 UTC (rev 2271)
+++ dists/trunk/live-helper/helpers/lh_config	2007-06-28 19:40:48 UTC (rev 2272)
@@ -291,6 +291,7 @@
 
 # Creating lh_binary_* configuration
 mkdir -p "${LIVE_ROOT}"/config/binary_grub
+mkdir -p "${LIVE_ROOT}"/config/binary_local-debs
 mkdir -p "${LIVE_ROOT}"/config/binary_local-hooks
 mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
 mkdir -p "${LIVE_ROOT}"/config/binary_local-udebs