Merge lp:~mwhudson/live-build/x-build-linaro into lp:~linaro-maintainers/live-build/trunk

[Michael Hudson-Doyle]

Hi,

This branch changes live-build to use qemu-debootstrap when cross building. I've talked about most of the changes to Loic and Steve at some point, I think. We'll probably use this in the linaro offspring install until some panda's turn up.

There isn't interest in this upstream at the moment (apparently "live-build 3.0" will only support multistrap, which noone seems to think is a particularly good idea, but...), so I'm not too worried about the fact that the functions in functions/architecture.sh are still a bit unclear.

Cheers,
mwh

[James Westby (james-w)]

Hi,

The code looks fine to me, and the changes aren't intrusive, so I'm happy with this.

166 - ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
167 + ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" ${LH_DEBOOTSTRAP_SCRIPT:+"$LH_DEBOOTSTRAP_SCRIPT"}

That doesn't use $DEBOOTSTRAP, is that intentional?

Thanks,

James

[Michael Hudson-Doyle (mwhudson)]

On Mon, 06 Dec 2010 20:42:54 -0000, James Westby <email address hidden> wrote:
> Hi,
>
> The code looks fine to me, and the changes aren't intrusive, so I'm happy with this.
>
> 166 - ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
> 167 + ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" ${LH_DEBOOTSTRAP_SCRIPT:+"$LH_DEBOOTSTRAP_SCRIPT"}
>
> That doesn't use $DEBOOTSTRAP, is that intentional?

Yes, qemu-debootstrap doesn't really support --download-only. I guess
this is a bug, but given what it does "qemu-debootstrap --download-only"
doesn't really make a whole lot of sense. I guess I should include this
as a comment in the source :-)

Cheers,
mwh

=== modified file 'functions/architecture.sh'
--- functions/architecture.sh	2010-10-22 02:20:39 +0000
+++ functions/architecture.sh	2010-12-05 23:39:57 +0000
@@ -7,7 +7,38 @@
 # This is free software, and you are welcome to redistribute it
 # under certain conditions; see COPYING for details.
 
-Check_architecture ()
+Native_arches ()
+{
+	if [ -x /usr/bin/dpkg ]
+	then
+		HOST="$(dpkg --print-architecture)"
+	else
+		HOST="$(uname -m)"
+	fi
+
+	case "${HOST}" in
+		amd64|i386|x86_64)
+			CROSS="amd64 i386"
+			;;
+
+		powerpc|ppc64)
+			CROSS="powerpc ppc64"
+			;;
+
+		*)
+			CROSS="${HOST}"
+			;;
+	esac
+
+	echo $CROSS
+}
+
+Native_building ()
+{
+	Host_architecture `Native_arches`
+}
+
+Host_architecture ()
 {
 	ARCHITECTURES="${@}"
 	VALID="false"
@@ -23,35 +54,23 @@
 
 	if [ "${VALID}" = "false" ]
 	then
+		return 1
+	else
+		return 0
+	fi
+}
+
+Check_architecture ()
+{
+	Host_architecture "${@}" || {
 		Echo_warning "skipping %s, foreign architecture." "${0}"
 		exit 0
-	fi
+	}
 }
 
 Check_crossarchitecture ()
 {
-	if [ -x /usr/bin/dpkg ]
-	then
-		HOST="$(dpkg --print-architecture)"
-	else
-		HOST="$(uname -m)"
-	fi
-
-	case "${HOST}" in
-		amd64|i386|x86_64)
-			CROSS="amd64 i386"
-			;;
-
-		powerpc|ppc64)
-			CROSS="powerpc ppc64"
-			;;
-
-		*)
-			CROSS="${HOST}"
-			;;
-	esac
-
-	Check_architecture "${CROSS}"
+	Check_architecture `Native_arches`
 }
 
 Check_multiarchitecture ()

=== modified file 'scripts/build/bootstrap_cache'
--- scripts/build/bootstrap_cache	2010-07-24 17:22:56 +0000
+++ scripts/build/bootstrap_cache	2010-12-05 23:39:57 +0000
@@ -24,7 +24,7 @@
 Set_defaults
 
 # Check architecture
-Check_crossarchitecture
+#Check_crossarchitecture
 
 Echo_message "Begin caching bootstrap stage..."
 

=== modified file 'scripts/build/bootstrap_debootstrap'
--- scripts/build/bootstrap_debootstrap	2010-07-24 17:22:56 +0000
+++ scripts/build/bootstrap_debootstrap	2010-12-05 23:39:57 +0000
@@ -29,12 +29,17 @@
 fi
 
 # Check architecture
-Check_crossarchitecture
+if Native_building
+then
+	Check_package /usr/sbin/debootstrap debootstrap
+	DEBOOTSTRAP=debootstrap
+else
+	Check_package /usr/bin/qemu-debootstrap qemu-kvm-extras-static
+	DEBOOTSTRAP=qemu-debootstrap
+fi
 
 Echo_message "Begin bootstrapping system..."
 
-Check_package /usr/sbin/debootstrap debootstrap
-
 # Ensure that a system is built as root
 lh testroot
 
@@ -60,7 +65,7 @@
 if [ "${LH_ARCHIVE_AREAS}" != "main" ]
 then
 	# Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LH_ARCHIVE_AREAS} | sed -e 's| |,|g')"
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LH_ARCHIVE_AREAS} | sed -e 's| |,|g')"
 fi
 
 if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
@@ -75,12 +80,12 @@
 
 if [ -n "${LH_BOOTSTRAP_INCLUDE}" ]
 then
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=$(echo ${LH_BOOTSTRAP_INCLUDE} | sed 's|  *|,|g')"
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=$(echo ${LH_BOOTSTRAP_INCLUDE} | sed 's|	*|,|g')"
 fi
 
 if [ -n "${LH_BOOTSTRAP_EXCLUDE}" ]
 then
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LH_BOOTSTRAP_EXCLUDE} | sed 's|  *|,|g')"
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LH_BOOTSTRAP_EXCLUDE} | sed 's|	*|,|g')"
 fi
 
 if [ "${LH_USE_FAKEROOT}" != "true" ]
@@ -112,7 +117,7 @@
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
 fi
 
-if [ -x "/usr/sbin/debootstrap" ]
+if [ -x `which $DEBOOTSTRAP` ]
 then
 	if [ "${LH_CACHE_PACKAGES}" = "true" ]
 	then
@@ -123,7 +128,7 @@
 		fi
 
 		Echo_breakage "Running debootstrap (download-only)... "
-		${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
+		${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" ${LH_DEBOOTSTRAP_SCRIPT:+"$LH_DEBOOTSTRAP_SCRIPT"}
 
 		if [ -n "${LH_ROOT_COMMAND}" ]
 		then
@@ -138,8 +143,8 @@
 		cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
 	fi
 
-	Echo_breakage "Running debootstrap... "
-	${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
+	Echo_breakage "Running $DEBOOTSTRAP... "
+	${LH_ROOT_COMMAND} $DEBOOTSTRAP ${DEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" ${LH_DEBOOTSTRAP_SCRIPT:+"$LH_DEBOOTSTRAP_SCRIPT"}
 
 	if [ -n "${LH_ROOT_COMMAND}" ]
 	then
@@ -152,6 +157,6 @@
 	# Creating stage file
 	Create_stagefile .stage/bootstrap
 else
-	Echo_error "Can't process file /usr/bin/debootstrap (FIXME)"
+	Echo_error "Can't process file $DEBOOTSTRAP (FIXME)"
 	exit 1
 fi