[Buildroot] [PATCH 1/5] nano: work around broken syntax highlighting regexes

[Buildroot] [PATCH 1/5] nano: work around broken syntax highlighting regexes

[Pascal de Bruijn]

Signed-off-by: Pascal de Bruijn <pmjdebruijn@pcode.nl>
---
 package/nano/nano.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 4d47fdb..c6eb29c 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -11,6 +11,9 @@ NANO_LICENSE_FILES = COPYING
 NANO_CONF_OPTS = --without-slang
 NANO_DEPENDENCIES = ncurses
 
+# work around broken syntax highlighting regexes
+NANO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DGNU_WORDBOUNDS=1"
+
 ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
 NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
 else
-- 
1.9.1

[Buildroot] [PATCH 2/5] defconfig: update raspberry pi 2 to linux 3.18.14

[Pascal de Bruijn]

Signed-off-by: Pascal de Bruijn <pmjdebruijn@pcode.nl>
---
 configs/raspberrypi2_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index 5859749..3fe3fe9 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -9,13 +9,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 
 # Lock to 3.18 headers as the RPi2 kernel is based off the 3.18 branch
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.14"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2747cc0bde4ca441691260fae1e34c9ef954ccae"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7d54f1754fd89bc11b27ca249ec148695f2eed06"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_ZIMAGE=y
 
-- 
1.9.1

[Buildroot] [PATCH 3/5] defconfig: update raspberry pi dt to linux 3.18.14

[Pascal de Bruijn]

Signed-off-by: Pascal de Bruijn <pmjdebruijn@pcode.nl>
---
 configs/raspberrypi_dt_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/raspberrypi_dt_defconfig b/configs/raspberrypi_dt_defconfig
index 991460e..79b719b 100644
--- a/configs/raspberrypi_dt_defconfig
+++ b/configs/raspberrypi_dt_defconfig
@@ -6,13 +6,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # Lock to 3.18 headers as the RPi kernel with
 # DT support is based off the 3.18 branch
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.14"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2747cc0bde4ca441691260fae1e34c9ef954ccae"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7d54f1754fd89bc11b27ca249ec148695f2eed06"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/raspberrypi/linux-3.18-rpi-dt.defconfig"
 BR2_LINUX_KERNEL_ZIMAGE=y
-- 
1.9.1

[Buildroot] [PATCH 4/5] rpi-firmware: update to match linux 3.18.14

[Pascal de Bruijn]

Signed-off-by: Pascal de Bruijn <pmjdebruijn@pcode.nl>
---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index cbcf790..89d3105 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = b9fac65dd9ff607d0c2c4ea1bbba2bbf3fbc4a10
+RPI_FIRMWARE_VERSION = 70b05985cf2b2b893bc6e55b12794f32857a78dd
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
-- 
1.9.1

[Buildroot] [PATCH 5/5] rpi-userland: update to match linux 3.18.14

[Pascal de Bruijn]

Signed-off-by: Pascal de Bruijn <pmjdebruijn@pcode.nl>
---
 package/rpi-userland/rpi-userland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 20a6af0..3b343de 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = 8f542a1647e6f88f254eadd9ad6929301c81913b
+RPI_USERLAND_VERSION = d4aa617de3b196399bb8e2ce32e181768cb52179
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
-- 
1.9.1

[Buildroot] [PATCH 2/5] defconfig: update raspberry pi 2 to linux 3.18.14

[Yann E. MORIN]

Pascal, All,

On 2015-05-28 20:41 +0200, Pascal de Bruijn spake thusly:
> Signed-off-by: Pascal de Bruijn <pmjdebruijn@pcode.nl>
> ---
>  configs/raspberrypi2_defconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
> index 5859749..3fe3fe9 100644
> --- a/configs/raspberrypi2_defconfig
> +++ b/configs/raspberrypi2_defconfig
> @@ -9,13 +9,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
>  
>  # Lock to 3.18 headers as the RPi2 kernel is based off the 3.18 branch
>  BR2_KERNEL_HEADERS_VERSION=y
> -BR2_DEFAULT_KERNEL_VERSION="3.18"
> +BR2_DEFAULT_KERNEL_VERSION="3.18.14"
>  BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_GIT=y
>  BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2747cc0bde4ca441691260fae1e34c9ef954ccae"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7d54f1754fd89bc11b27ca249ec148695f2eed06"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
>  BR2_LINUX_KERNEL_ZIMAGE=y

I have a series that further updates all our RPi defconfigs to use the
nos-considered stable rpi-4.0.y branch, update rpi-firmware and
rpi-userland, and finally enhance rpi-firmware to only install DTBs
conditionally, and install DTB overlays.

I'll submit that series a bit later tonight, when I finally test it on
the real hardware.

In the meantime, I'm marking those rpi-related patches as Changes
Requested in our Patchwork.

Thanks! :-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/5] nano: work around broken syntax highlighting regexes

[Thomas Petazzoni]

Dear Pascal de Bruijn,

On Thu, 28 May 2015 20:41:46 +0200, Pascal de Bruijn wrote:
> Signed-off-by: Pascal de Bruijn <pmjdebruijn@pcode.nl>
> ---
>  package/nano/nano.mk | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/package/nano/nano.mk b/package/nano/nano.mk
> index 4d47fdb..c6eb29c 100644
> --- a/package/nano/nano.mk
> +++ b/package/nano/nano.mk
> @@ -11,6 +11,9 @@ NANO_LICENSE_FILES = COPYING
>  NANO_CONF_OPTS = --without-slang
>  NANO_DEPENDENCIES = ncurses
>  
> +# work around broken syntax highlighting regexes
> +NANO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DGNU_WORDBOUNDS=1"
> +

There was a ./configure option --with-wordbounds to also do this, so I
use that instead of fiddling with CFLAGS.

Committed with that change, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com