Merge pull request #5 from simonvanderveldt/bump-2019.02.7

Update buildroot to 2019.02.7

Dockerfile

@@ -35,7 +35,7 @@ RUN apt-get update && apt-get install -y -q \
 RUN sed -i "s/^# en_US.UTF-8/en_US.UTF-8/" /etc/locale.gen && locale-gen && update-locale LANG=en_US.UTF-8
 
 # Install buildroot
-ENV BR_VERSION 2018.11.4
+ENV BR_VERSION 2019.02.7
 
 RUN wget -qO- http://buildroot.org/downloads/buildroot-$BR_VERSION.tar.gz \
  | tar xz && mv buildroot-$BR_VERSION /buildroot
@@ -44,4 +44,4 @@ WORKDIR /buildroot
 
 # Apply patches
 COPY patches ./patches
-RUN for patch in patches/*.patch; do echo "Applying patch '$patch'" && patch -p1 < "$patch"; done
+RUN for patch in patches/*.patch; do echo "Applying patch '$patch'" && patch -p1 < "$patch" || exit 1; done

README.md

@@ -34,7 +34,7 @@ Create a directory containing your buildroot customizations, for example:
 
 To use your configuration with the buildroot image use a volume mount to mount the directory inside the container and set the `BR2_EXTERNAL` environment variable to the directory name inside the container. For example:
 ```
-docker run -ti -e BR2_EXTERNAL=/mycustombuildroot -v `pwd`:/mycustombuildroot simonvanderveldt/buildroot:2018.11.4
+docker run -ti -e BR2_EXTERNAL=/mycustombuildroot -v `pwd`:/mycustombuildroot simonvanderveldt/buildroot:2019.02.7
 ```
 
 Now you can issue your regular buildroot commands, like `make menuconfig` or `make <boardname>_defconfig` followed by `make`.

patches/linux-build-dtbs-using-kernel-make-target.patch

@@ -1,26 +1,26 @@
-From d9616d25837ee7b9abfce18bda2e9fc26a3abfdb Mon Sep 17 00:00:00 2001
+From eccdbd782d1a7f01aceeaa285971a3c888ee83a9 Mon Sep 17 00:00:00 2001
 From: Simon van der Veldt <simon.vanderveldt@gmail.com>
 Date: Thu, 21 Feb 2019 20:09:52 +0100
-Subject: [PATCH] Add patch to build in-kernel devicetree overlays using the
- kernel's 'make dtbs' target
+Subject: [PATCH 1/3] Build in-kernel devicetree overlays using the kernel's
+ 'make dtbs' target
 
 ---
  linux/linux.mk | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/linux/linux.mk b/linux/linux.mk
-index 2b5d096e14..27526cdc39 100644
+index a1378345c3..833b4a358a 100644
 --- a/linux/linux.mk
 +++ b/linux/linux.mk
-@@ -447,6 +447,7 @@ define LINUX_BUILD_CMDS
- 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
- 		$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
- 	fi
+@@ -452,6 +452,7 @@ define LINUX_BUILD_CMDS
+ 	)
+ 	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) all
+ 	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
 +	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) dtbs
  	$(LINUX_BUILD_DTB)
  	$(LINUX_APPEND_DTB)
  endef
-@@ -484,6 +485,7 @@ endef
+@@ -489,6 +490,7 @@ endef
  define LINUX_INSTALL_IMAGES_CMDS
  	$(call LINUX_INSTALL_IMAGE,$(BINARIES_DIR))
  	$(call LINUX_INSTALL_DTB,$(BINARIES_DIR))

patches/package-rpi-firmware-install-all-firmware-blobs.patch

@@ -1,8 +1,8 @@
-From 1055dcda52e7e32b962a742b509e70328998ca14 Mon Sep 17 00:00:00 2001
+From 218971fa1902c6f1d425d20fdc85d65c384654c9 Mon Sep 17 00:00:00 2001
 From: Simon van der Veldt <simon.vanderveldt@gmail.com>
 Date: Sat, 23 Feb 2019 10:06:12 +0100
-Subject: [PATCH] package/rpi-firmware: Install all .dat and .elf files using
- their original name.
+Subject: [PATCH 2/3] package/rpi-firmware: Install all .dat and .elf files
+ using their original name.
 
 This fixes an issue where running with gpu_mem < 32MB won't boot ceause the .elf file needs to be called start_cd.elf but was called start.elf
 This also enables to user to use different bootloader blobs at runtime by changing config.txt
@@ -56,10 +56,10 @@ index 0ebbe7a4cd..acfdb7253b 100644
  	string
  	default ""      if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
-index 22eaaa2886..c6f0f94221 100644
+index 630bc670ca..e80afcce93 100644
 --- a/package/rpi-firmware/rpi-firmware.mk
 +++ b/package/rpi-firmware/rpi-firmware.mk
-@@ -38,8 +38,8 @@ endif # INSTALL_VCDBG
+@@ -43,8 +43,8 @@ endif # INSTALL_VCDBG
 
  define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
  	$(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin

patches/package-systemd-only-create-s-j-gateway-s-j-remote-user-when-s-j-gateway-enabled.patch

@@ -1,7 +1,7 @@
-From dda7cfc247b2f0c3ead5a0760365c53b690de6b3 Mon Sep 17 00:00:00 2001
+From c1de4f31e2a3e8cdf8e338d1e6d3236657cb378e Mon Sep 17 00:00:00 2001
 From: Simon van der Veldt <simon.vanderveldt@gmail.com>
 Date: Wed, 27 Feb 2019 20:01:19 +0100
-Subject: [PATCH] package/systemd: Only create systemd-journal-gateway and
+Subject: [PATCH 3/3] package/systemd: Only create systemd-journal-gateway and
  systemd-journal-remote users when the systemd journal gateway package is
  enabled
 
@@ -15,10 +15,10 @@ See https://github.com/systemd/systemd/blob/v240/meson.build#L2234 for reference
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
-index 15db1969e5..a53b9052cd 100644
+index 6f0e451b5b..b7e656b906 100644
 --- a/package/systemd/systemd.mk
 +++ b/package/systemd/systemd.mk
-@@ -147,7 +147,9 @@ endif
+@@ -168,7 +168,9 @@ endif
 
  ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y)
  SYSTEMD_DEPENDENCIES += libmicrohttpd
@@ -29,7 +29,7 @@ index 15db1969e5..a53b9052cd 100644
  ifeq ($(BR2_PACKAGE_LIBQRENCODE),y)
  SYSTEMD_CONF_OPTS += -Dqrencode=true
  SYSTEMD_DEPENDENCIES += libqrencode
-@@ -155,7 +157,7 @@ else
+@@ -176,7 +178,7 @@ else
  SYSTEMD_CONF_OPTS += -Dqrencode=false
  endif
  else
@@ -38,7 +38,7 @@ index 15db1969e5..a53b9052cd 100644
  endif
 
  ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
-@@ -361,9 +363,9 @@ define SYSTEMD_USERS
+@@ -382,9 +384,9 @@ define SYSTEMD_USERS
  	- - render -1 * - - - DRI rendering nodes
  	- - kvm -1 * - - - kvm nodes
  	systemd-bus-proxy -1 systemd-bus-proxy -1 * - - - Proxy D-Bus messages to/from a bus