Hi folks, Attached are a couple of patches to Freedom-Maker.
The first reverts vmdebootstrap's argument handling of --no-extlinux, as it did not work (it would complain that the --no-extlinux argument was not valid). I suspect it may work without this patch with newer versions of python-cliapp, but I'm using Wheezy, where it doesn't. Without this patch I couldn't build an image at all. The second patch removes the nonfree section for the BeagleBone. I tested, and it seems to work fine without it (it certainly boots without issue). Also, there were quite a few dependencies I needed to install before freedom-maker would work, namely: - python-cliapp - kpartx - parted - btrfs-tools - debootstrap - qemu-user-static Shall I go ahead and add a section to the README listing these? Nick White
From c88c976e918a86a2f2eb5c638795001832a8c63e Mon Sep 17 00:00:00 2001 From: Nick White <[email protected]> Date: Wed, 15 Apr 2015 15:15:28 +0100 Subject: [PATCH 1/2] Go back to the old --no-extlinux processing in vmdebootstrap The newer --extlinux switch doesn't recognise --no-extlinux, at least with the python-cliapp on Wheezy (1.20120630-1). This prevented non virtualbox images from building. --- .../vmdebootstrap/04-use-no-extlinux.patch | 46 ++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 vendor-patches/vmdebootstrap/04-use-no-extlinux.patch diff --git a/vendor-patches/vmdebootstrap/04-use-no-extlinux.patch b/vendor-patches/vmdebootstrap/04-use-no-extlinux.patch new file mode 100644 index 0000000..1952c22 --- /dev/null +++ b/vendor-patches/vmdebootstrap/04-use-no-extlinux.patch @@ -0,0 +1,46 @@ +From 775a6bf1487122cc3af6ea46fc61f64b3d5d4fec Mon Sep 17 00:00:00 2001 +From: Nick White <[email protected]> +Date: Tue, 7 Apr 2015 12:07:35 +0100 +Subject: [PATCH] Use no-extlinux rather than a non-changeable extlinux + +--- + vmdebootstrap | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/vmdebootstrap b/vmdebootstrap +index 831833e..b61f3a9 100755 +--- a/vmdebootstrap ++++ b/vmdebootstrap +@@ -84,9 +84,8 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth + ['variant'], + 'select debootstrap variant it not using the default') + self.settings.boolean( +- ['extlinux'], +- 'install extlinux?', +- default=True) ++ ['no-extlinux'], ++ 'do not install extlinux') + self.settings.string( + ['tarball'], + "tar up the disk's contents in FILE", +@@ -194,7 +193,7 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth + if self.settings['image']: + self.create_empty_image() + self.partition_image() +- if self.settings['mbr'] or self.settings['extlinux']: ++ if self.settings['mbr'] or not self.settings['no-extlinux']: + self.install_mbr() + (rootdev, bootdev, swapdev) = self.setup_kpartx() + if self.settings['swap'] > 0: +@@ -249,7 +248,7 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth + if self.settings['image']: + if self.settings['grub']: + self.install_grub2(rootdev, rootdir, rootfsdir) +- elif self.settings['extlinux']: ++ elif not self.settings['no-extlinux']: + self.install_extlinux(rootdev, rootdir, rootfsdir) + self.append_serial_console(rootdir) + self.optimize_image(rootdir) +-- +1.7.10.4 + -- 1.7.10.4
From 6424c8d7cab66a5454c581ffcd8fe33b8986d7d3 Mon Sep 17 00:00:00 2001 From: Nick White <[email protected]> Date: Wed, 15 Apr 2015 15:19:48 +0100 Subject: [PATCH 2/2] Don't enable the nonfree repository for BeagleBone images It isn't necessary or desirable. It can probably also be removed from the cubietruck images. --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index f1f3178..8f64f7e 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,6 @@ beaglebone: prep $(eval ARCHITECTURE = armhf) $(eval MACHINE = beaglebone) $(eval DESTINATION = card) - $(eval ENABLE_NONFREE = yes) $(MAKE_IMAGE) $(TAR) $(ARCHIVE) $(IMAGE) @echo "" -- 1.7.10.4
signature.asc
Description: Digital signature
_______________________________________________ Freedombox-discuss mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/freedombox-discuss
