Skip to content

Commit

Permalink
buildroot-2018.02-rc1
Browse files Browse the repository at this point in the history
- bash 4.4.12
- e2fsprogs 1.43.8
- glibc 9331dbdcd7aa8e997eb4caa9b1b0cb6c804320c8
- tzdata 2018c
- util-linux 2.31.1
  • Loading branch information
ailispaw committed Feb 10, 2018
1 parent 6277e01 commit 5654aea
Show file tree
Hide file tree
Showing 16 changed files with 79 additions and 49 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ENV SRC_DIR=/build \
BR_ROOT=/build/buildroot
RUN mkdir -p ${SRC_DIR} ${OVERLAY}

ENV BR_VERSION 2017.11.1
ENV BR_VERSION 2018.02-rc1
RUN wget -qO- https://buildroot.org/downloads/buildroot-${BR_VERSION}.tar.bz2 | tar xj && \
mv buildroot-${BR_VERSION} ${BR_ROOT}

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ It's inspired by the following projects.

## Features

- Built with Buildroot 2017.11.1 with Linux kernel v4.9.77 and glibc.
- Built with Buildroot 2018.02 with Linux kernel v4.9.77 and glibc.
- Strip down the Linux kernel modules and drivers
- Busybox + the following utilities from Buildroot
- sudo, bash, wget, xz, sntp, logrotate
Expand Down
2 changes: 1 addition & 1 deletion configs/buildroot.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Buildroot 2017.11.1 Configuration
# Buildroot 2018.02-rc1 Configuration
#
BR2_HAVE_DOT_CONFIG=y
BR2_HOST_GCC_AT_LEAST_4_5=y
Expand Down
2 changes: 1 addition & 1 deletion patches/0001-docker-engine-use-v1.10.3.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7ad26ed2fe95172476cd9434ed09e1e5004309d1 Mon Sep 17 00:00:00 2001
From 3b9ba39f9e79b27087fad48d38a8cdb7f941fb41 Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Mon, 8 May 2017 08:35:29 -0700
Subject: [PATCH] docker-engine: use v1.10.3
Expand Down
2 changes: 1 addition & 1 deletion patches/0002-Add-a-patch-Ignore-invalid-host-header.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 72da28cd1709cb37cf319a8d208069e3bddc6951 Mon Sep 17 00:00:00 2001
From 74c338b3b9e6577344a19a2e281a5081819d7568 Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Thu, 1 Sep 2016 16:56:43 -0700
Subject: [PATCH] =?UTF-8?q?Add=20a=20patch=20=E2=80=9CIgnore=20invalid=20h?=
Expand Down
2 changes: 1 addition & 1 deletion patches/0003-go-bump-version-back-to-1.7.6.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2fbcc45c9b02458ed43b21741dfa1723a52e18d8 Mon Sep 17 00:00:00 2001
From bcac17c6b2b7b6120ce463b34dc969c6f6193dbc Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Thu, 29 Dec 2016 15:37:26 -0800
Subject: [PATCH] go: bump version back to 1.7.6
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 23d38126fa0a4c30cb63713a09e12e0ae24b11bd Mon Sep 17 00:00:00 2001
From 74eb6b5d3ae3f189d42de6c431c4126ba88742cc Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Sun, 14 May 2017 15:56:47 -0700
Subject: [PATCH] Revert "busybox: preserve ncurses progs/tools"
Expand All @@ -9,7 +9,7 @@ This reverts commit 33c72344a8686a136c1da6a056ed6c0945bbf8b7.
1 file changed, 5 insertions(+)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 94c8c9ade3..76200ffac0 100644
index e63b6e4aed..677d7940c0 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -29,6 +29,11 @@ NCURSES_CONF_OPTS = \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 04c64ed3943912ab26389e92516e5502a1b5bad4 Mon Sep 17 00:00:00 2001
From a9337213687de5342b5899d36b83dc3ae15398ef Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Sun, 14 May 2017 15:56:59 -0700
Subject: [PATCH] Revert "ncurses: drop unneeded trailing backslashes"
Expand All @@ -9,7 +9,7 @@ This reverts commit 734363aeaa976955457925ca130ebd3787c8b820.
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 76200ffac0..cc0c5b405a 100644
index 677d7940c0..0105a7365a 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -27,7 +27,8 @@ NCURSES_CONF_OPTS = \
Expand All @@ -22,9 +22,9 @@ index 76200ffac0..cc0c5b405a 100644

# Install after busybox for the full-blown versions
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
@@ -65,7 +66,7 @@ NCURSES_TERMINFO_FILES = \
v/vt220 \
x/xterm \
@@ -68,7 +69,7 @@ NCURSES_TERMINFO_FILES = \
x/xterm+256color \
x/xterm-256color \
x/xterm-color \
- x/xterm-xfree86
+ x/xterm-xfree86 \
Expand Down
11 changes: 4 additions & 7 deletions patches/0006-Revert-ncurses-bump-to-6.0.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 831ca9a666745ea9c86d23208ef3d6a35cb0db24 Mon Sep 17 00:00:00 2001
From d13ca54045643051a1648e585193c35076f057e2 Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Sun, 14 May 2017 15:57:09 -0700
Subject: [PATCH] Revert "ncurses: bump to 6.0"
Expand Down Expand Up @@ -212,7 +212,7 @@ index 6bca143836..482b2d4853 100644
-sha256 f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260 ncurses-6.0.tar.gz
+sha256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b ncurses-5.9.tar.gz
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index cc0c5b405a..952be566e8 100644
index 0105a7365a..20c82c05fe 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -4,13 +4,13 @@
Expand Down Expand Up @@ -243,15 +243,12 @@ index cc0c5b405a..952be566e8 100644

# Install after busybox for the full-blown versions
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
@@ -103,6 +101,7 @@ NCURSES_LINK_STAGING_LIBS = \
@@ -106,10 +104,13 @@ NCURSES_LINK_STAGING_LIBS = \
NCURSES_LINK_STAGING_PC = $(call NCURSES_LINK_PC)

NCURSES_CONF_OPTS += --enable-ext-colors
+NCURSES_ABI_VERSION = 6
NCURSES_TERMINFO_FILES += \
p/putty-256color \
x/xterm+256color \
@@ -111,6 +110,8 @@ NCURSES_TERMINFO_FILES += \

NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_LIBS
NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_PC

Expand Down
10 changes: 5 additions & 5 deletions patches/0007-ncurses-drop-an-unneeded-trailing-backslash.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c0795808eeaeba66e4b72a55e40ad9daa7847b8e Mon Sep 17 00:00:00 2001
From 28b552a4ee626a7c02facc2cf104dc047fa2d4e1 Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Thu, 3 Aug 2017 12:03:27 -0700
Subject: [PATCH] ncurses: drop an unneeded trailing backslash
Expand All @@ -8,12 +8,12 @@ Subject: [PATCH] ncurses: drop an unneeded trailing backslash
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 952be566e8..cc3f81b107 100644
index 20c82c05fe..ad7f802287 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -64,7 +64,7 @@ NCURSES_TERMINFO_FILES = \
v/vt220 \
x/xterm \
@@ -67,7 +67,7 @@ NCURSES_TERMINFO_FILES = \
x/xterm+256color \
x/xterm-256color \
x/xterm-color \
- x/xterm-xfree86 \
+ x/xterm-xfree86
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 57ae94073171cfb20dc0c009af2b95f2c766dd81 Mon Sep 17 00:00:00 2001
From aae675860a7205973cc5c15af6c3e3360446ec7d Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Mon, 15 May 2017 15:52:29 -0700
Subject: [PATCH] libopenssl: Remove debug information to reduce its footprint
Expand Down
24 changes: 12 additions & 12 deletions patches/0009-Revert-binutils-remove-support-for-2.26.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f6e9c1dbf10e0a03bdb6d13a40484897b3cda106 Mon Sep 17 00:00:00 2001
From b92ee898fcdf29d7b870526b51264d1c56f9ff09 Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Thu, 3 Aug 2017 19:13:58 -0700
Subject: [PATCH] Revert "binutils: remove support for 2.26"
Expand Down Expand Up @@ -37,10 +37,10 @@ This reverts commit 0b5dc3192306409113adbb0dfbcaa62bbcdf4fb4.
create mode 100644 package/binutils/2.26.1/0906-microblaze-pr21180.patch

diff --git a/Config.in.legacy b/Config.in.legacy
index 35a6d6e1fe..8668d7cf08 100644
index 60f9148234..aa556141e6 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -276,14 +276,6 @@ config BR2_PACKAGE_SIMICSFS
@@ -347,14 +347,6 @@ config BR2_PACKAGE_SIMICSFS
work. Users should move to the user mode Simics agent
instead.

Expand Down Expand Up @@ -1147,7 +1147,7 @@ index 0000000000..8104db3462
+ else
+ {
diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index 95144c84c9..4179ee2805 100644
index d4ed1e3183..4b20bcdf3f 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -7,6 +7,9 @@ choice
Expand All @@ -1157,27 +1157,27 @@ index 95144c84c9..4179ee2805 100644
+config BR2_BINUTILS_VERSION_2_26_X
+ bool "binutils 2.26.1"
+
config BR2_BINUTILS_VERSION_2_27_X
bool "binutils 2.27"
# binutils 2.27 triggers a bug in elf2flt on ARM/noMMU
@@ -23,6 +26,7 @@ endchoice
config BR2_BINUTILS_VERSION_2_28_X
bool "binutils 2.28.1"
depends on !BR2_arc
@@ -25,6 +28,7 @@ endchoice
config BR2_BINUTILS_VERSION
string
default "arc-2017.09-release" if BR2_arc
default "arc-2017.09-release" if BR2_BINUTILS_VERSION_ARC
+ default "2.26.1" if BR2_BINUTILS_VERSION_2_26_X
default "2.27" if BR2_BINUTILS_VERSION_2_27_X
default "2.28.1" if BR2_BINUTILS_VERSION_2_28_X
default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X
default "2.30" if BR2_BINUTILS_VERSION_2_30_X
diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash
index a7d4cdd453..21b288d306 100644
index 4578a7f56a..f96ca8d5d0 100644
--- a/package/binutils/binutils.hash
+++ b/package/binutils/binutils.hash
@@ -1,4 +1,5 @@
# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum
+sha512 9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322bb6cb2b45e8df812f0e8ac059149f8a1f69ba3ed9d86a35c6a540b67 binutils-2.26.1.tar.bz2
sha512 cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb binutils-2.27.tar.bz2
sha512 dc5b6872ae01c07c12d38f3bb7ead06effc6da3265ac872e2d9c6104304f89f85f2645b029a43f308a7938a7299b1928d385205d0a2245674a621649032a138d binutils-2.28.1.tar.xz
sha512 d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e82624ae37fb0bbd03af3b17088a94f60dfe1a86a7ff82e18ece3c24f0fd0 binutils-2.29.1.tar.xz
sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 binutils-2.30.tar.xz
--
2.14.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5cd7f3dcc2d8eb7373f5f50e028526a4cdb04cd5 Mon Sep 17 00:00:00 2001
From a9803f04d2d150de8ecf8944888420d9ce80922e Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Tue, 7 Nov 2017 13:52:44 -0800
Subject: [PATCH] package/glibc: switch to release/2.25/master branch
Expand All @@ -19,11 +19,11 @@ index f3a6577d2a..9209bee43f 100644
# Locally calculated (fetched from Github)
sha256 5aa9adeac09727db0b8a52794186563771e74d70410e9fd86431e339953fd4bb glibc-arc-2017.09-release.tar.gz
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index cb3a84a9a7..196b632485 100644
index fd79d84f15..10bb768c7e 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -10,8 +10,8 @@ GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VE
GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.gz
@@ -9,8 +9,8 @@ GLIBC_VERSION = arc-2017.09-release
GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION))
else
# Generate version string using:
-# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3b241d61afc226cd81483e2c4561ade8a6fde479 Mon Sep 17 00:00:00 2001
From 930067783a0cc44eedc88137e9c3efcacee0190c Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Mon, 6 Nov 2017 15:19:04 -0800
Subject: [PATCH] Revise the default PATH with /opt/bin for Barge
Expand Down
12 changes: 6 additions & 6 deletions patches/0012-package-glibc-update-with-upstream-patches.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2542c648ae1c016002343d48f9ed5f814baa8206 Mon Sep 17 00:00:00 2001
From 9b9df0227ea400a984a1e795b0ef69a97094fe8b Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Thu, 7 Dec 2017 23:11:28 -0800
Subject: [PATCH] package/glibc: update with upstream patches
Expand All @@ -10,25 +10,25 @@ https://github.com/bminor/glibc/tree/release/2.25/master
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash
index 9209bee43f..5bad591281 100644
index 9209bee43f..af546b5a9c 100644
--- a/package/glibc/glibc.hash
+++ b/package/glibc/glibc.hash
@@ -1,4 +1,4 @@
# Locally calculated (fetched from Github)
-sha256 a86c54f71f77890d36d983a8f2b0e59fdfae82a80d0419ddbc67cc4857fbe42f glibc-b0afcf5db758747c2e563a1db0af6db7a1927746.tar.gz
+sha256 9fe485bd62fb95c2f23f368d47bcf1abb93889178d0d6209c29a26eb1964260e glibc-edcf13e25c1559558a6f12ff5a71d4136a39235e.tar.gz
+sha256 fa85e19fb360a50746dfe05f6cbf10e12c6168e3ee27de1198a741e60e03fb12 glibc-9331dbdcd7aa8e997eb4caa9b1b0cb6c804320c8.tar.gz
# Locally calculated (fetched from Github)
sha256 5aa9adeac09727db0b8a52794186563771e74d70410e9fd86431e339953fd4bb glibc-arc-2017.09-release.tar.gz
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 196b632485..7ac9235ba3 100644
index 10bb768c7e..5be65ca012 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -11,7 +11,7 @@ GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.gz
@@ -10,7 +10,7 @@ GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VE
else
# Generate version string using:
# git describe --match 'glibc-*' --abbrev=40 origin/release/2.25/master
-GLIBC_VERSION = b0afcf5db758747c2e563a1db0af6db7a1927746
+GLIBC_VERSION = edcf13e25c1559558a6f12ff5a71d4136a39235e
+GLIBC_VERSION = 9331dbdcd7aa8e997eb4caa9b1b0cb6c804320c8
# Upstream doesn't officially provide an https download link.
# There is one (https://sourceware.org/git/glibc.git) but it's not reliable,
# sometimes the connection times out. So use an unofficial github mirror.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 30272c278efcd315a80c77801e2bf28fa2e73709 Mon Sep 17 00:00:00 2001
From: "A.I" <[email protected]>
Date: Sat, 10 Feb 2018 11:48:42 +0900
Subject: [PATCH] package/binutils: support bz2-compressed tarball for 2.26.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

revert “package/binutils: remove support for 2.27”
SHA: 453d29f1f45736d0156071930a09015def68994a
---
package/binutils/binutils.mk | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 1bd01ecefc..a8f119b1c6 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -21,7 +21,11 @@ BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
BINUTILS_FROM_GIT = y
endif
BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils
+ifeq ($(BINUTILS_VERSION),2.26.1)
+BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.bz2
+else
BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.xz
+endif
BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
BINUTILS_INSTALL_STAGING = YES
BINUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
--
2.14.1

0 comments on commit 5654aea

Please sign in to comment.