Merge pull request #3 from ThomasKaiser/master

Add preliminary Debian Stretch multistrapping

Author: ayufan

Makefile

@@ -4,7 +4,7 @@ export LINUX_BRANCH ?= my-hacks-1.2
 export BOOT_TOOLS_BRANCH ?= master
 LINUX_LOCALVERSION ?= -ayufan-$(RELEASE)
 
-all: xenial-pinebook
+all: linux-pinebook
 
 linux/.git:
 	git clone --depth=1 --branch=$(LINUX_BRANCH) --single-branch \
@@ -112,6 +112,16 @@ xenial-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img: simple-image-pinebo
 		pinebook \
 		i3
 
+stretch-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img: simple-image-pinebook-$(RELEASE_NAME).img.xz linux-pine64-$(RELEASE_NAME).tar.xz linux-pine64-package-$(RELEASE_NAME).deb boot-tools
+	sudo bash ./build-pine64-image.sh \
+		$(shell readlink -f $@) \
+		$(shell readlink -f simple-image-pinebook-$(RELEASE_NAME).img.xz) \
+		$(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz) \
+		$(shell readlink -f linux-pine64-package-$(RELEASE_NAME).deb) \
+		stretch \
+		pinebook \
+		i3
+
 .PHONY: kernel-tarball
 kernel-tarball: linux-pine64-$(RELEASE_NAME).tar.xz
 
@@ -130,5 +140,11 @@ xenial-mate-pinebook: xenial-mate-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).
 .PHONY: xenial-i3-pinebook
 xenial-i3-pinebook: xenial-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
+.PHONY: stretch-i3-pinebook
+stretch-i3-pinebook: stretch-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
+
 .PHONY: xenial-pinebook
 xenial-pinebook: xenial-minimal-pinebook xenial-mate-pinebook xenial-i3-pinebook
+
+.PHONY: linux-pinebook
+linux-pinebook: xenial-minimal-pinebook xenial-mate-pinebook xenial-i3-pinebook stretch-i3-pinebook

build-environment/Dockerfile

@@ -9,7 +9,7 @@ RUN apt-get install -y python git-core gnupg flex bison gperf build-essential \
     dosfstools gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
     gcc-arm-linux-gnueabi g++-arm-linux-gnueabi ccache \
     sudo cpio nano vim kmod kpartx wget bsdtar qemu-user-static \
-    pxz ruby-dev
+    pxz ruby-dev debootstrap multistrap
 
 RUN gem install fpm
 

simpleimage/make_rootfs.sh

@@ -83,6 +83,10 @@ case $DISTRO in
 		ROOTFS="${DISTRO}-base-arm64.tar.gz"
 		METHOD="debootstrap"
 		;;
+	stretch)
+		ROOTFS="${DISTRO}-base-arm64.tar.gz"
+		METHOD="multistrap"
+		;;
 	*)
 		echo "Unknown distribution: $DISTRO"
 		exit 1
@@ -106,8 +110,6 @@ deboostrap_rootfs() {
 	bsdtar --include ./usr/share/keyrings/$KR --strip-components 4 -xvf "$DATA"
 	rm -f "$DATA"
 
-	apt-get -y install debootstrap qemu-user-static
-
 	qemu-debootstrap --arch=arm64 --keyring=$TEMP/$KR $dist rootfs http://httpredir.debian.org/debian
 	rm -f $KR
 
@@ -120,6 +122,44 @@ deboostrap_rootfs() {
 	cd -
 }
 
+multistrap_rootfs() {
+	dist="$1"
+	tgz="$(readlink -f "$2")"
+
+	[ "$TEMP" ] || exit 1
+	cd $TEMP && pwd
+
+	cat > multistrap.conf <<EOF
+[General]
+noauth=true
+unpack=true
+debootstrap=Debian Net
+aptsources=Debian
+
+[Debian]
+# Base packages
+packages=systemd systemd-sysv udev apt kmod locales sudo
+source=http://deb.debian.org/debian/
+keyring=debian-archive-keyring
+components=main non-free
+suite=stretch
+
+[Net]
+# Networking packages
+packages=netbase net-tools ethtool iproute iputils-ping ifupdown dhcpcd5 firmware-brcm80211 wpasupplicant ssh avahi-daemon ntp wireless-tools
+EOF
+
+	multistrap -a arm64 -d rootfs -f multistrap.conf
+
+	# keeping things clean as this is copied later again
+	rm -f rootfs/usr/bin/qemu-aarch64-static
+
+	bsdtar -C $TEMP/rootfs -a -cf $tgz .
+	rm -fr $TEMP/rootfs
+
+	cd -
+}
+
 mkdir -p $BUILD
 TARBALL="$BUILD/$(basename $ROOTFS)"
 mkdir -p "$BUILD"
@@ -129,6 +169,8 @@ if [ ! -e "$TARBALL" ]; then
 		wget -O "$TARBALL" "$ROOTFS"
 	elif [ "$METHOD" = "debootstrap" ]; then
 		deboostrap_rootfs "$DISTRO" "$TARBALL"
+	elif [ "$METHOD" = "multistrap" ]; then
+		multistrap_rootfs "$DISTRO" "$TARBALL"
 	else
 		echo "Unknown rootfs creation method"
 		exit 1
@@ -177,6 +219,19 @@ deb http://security.debian.org/ ${release}/updates main contrib non-free
 EOF
 }
 
+add_stretch_apt_sources() {
+	local release="$1"
+	local aptsrcfile="$DEST/etc/apt/sources.list"
+	cat > "$aptsrcfile" <<EOF
+deb http://deb.debian.org/debian stretch main contrib non-free
+deb-src http://deb.debian.org/debian stretch main contrib non-free
+deb http://deb.debian.org/debian stretch-updates main contrib non-free
+deb-src http://deb.debian.org/debian stretch-updates main contrib non-free
+deb http://security.debian.org/ stretch/updates main contrib non-free
+deb-src http://security.debian.org/ stretch/updates main contrib non-free
+EOF
+}
+
 add_ubuntu_apt_sources() {
 	local release="$1"
 	cat > "$DEST/etc/apt/sources.list" <<EOF
@@ -205,7 +260,7 @@ case $DISTRO in
 		echo "No longer supported"
 		exit 1
 		;;
-	xenial|sid|jessie)
+	xenial|sid|jessie|stretch)
 		rm "$DEST/etc/resolv.conf"
 		cp /etc/resolv.conf "$DEST/etc/resolv.conf"
 		if [ "$DISTRO" = "xenial" ]; then
@@ -222,6 +277,13 @@ case $DISTRO in
 			EXTRADEBS="sudo"
 			ADDPPACMD=
 			DISPTOOLCMD=
+		elif [ "$DISTRO" = "stretch" ]; then
+			DEB=stretch
+			DEBUSER=debian
+			DEBUSERPW=debian
+			EXTRADEBS="sudo"
+			ADDPPACMD=
+			DISPTOOLCMD=
 		else
 			echo "Unknown DISTRO=$DISTRO"
 			exit 2