Skip to contentSkip to conversation

support/gnucomnfig: update (branch yem/gnuconfig)

PATCH New Yann E. MORIN 3 participants 8 messages May 9, 2020 – May 10, 2020

lore
Share & tools
lore
#0 lore raw

cover support/gnucomnfig: update (branch yem/gnuconfig)

Hello All!

This small series updated our bundled copy of the GNU config scripts. The crux of this series is not the update per-se, but rather adding a script to do the update automatically, to avoid having a stray reference to the upstream sha1.

Regards,
Yann E. MORIN.

The following changes since commit 7f59e2c01a78c99c933df49ee681cdd3e11f4b07

package/matchbox: add hash for license file (2020-05-08 22:02:49 +0200)

are available in the git repository at:

git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to 0c4bc29d6423a6791afcf37fa05d27f855247355

support/gnuconfig: update (2020-05-09 10:17:04 +0200)

----------------------------------------------------------------
Yann E. MORIN (3):
support/gnuconfig: reference the correct sha1 we're using support/gnuconfig: add update script support/gnuconfig: update

 support/gnuconfig/README.buildroot | 14 ++-----
 support/gnuconfig/config.guess     | 80 +++++++++++++++++++++++---------------
 support/gnuconfig/config.sub       | 37 ++++++++----------
 support/gnuconfig/update           | 14 +++++++
 4 files changed, 82 insertions(+), 63 deletions(-)
 create mode 100755 support/gnuconfig/update
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH 1/3 support/gnuconfig: reference the correct sha1 we're using

In commit ff9f778c66f4 (support/gnuconfig: update to 2019-05-28), we forgot to update the README to reference the sha1 we're using, keeping the old one from 2016...

Update it now.

Cc Thomas Petazzoni <[email protected]>
---
 support/gnuconfig/README.buildroot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
support/gnuconfig/README.buildroot +1 -1
index 7ba2a332a4..7e7d49830f 100644
@@ -24,4 +24,4 @@ Currently no patches are needed, but they may be needed again in the
 future.
 
 The current Buildroot version is based on the Git commit
-dafd8e767ec87b90aac62f0fcedd11944c84b50a of the config.git repository.
+104ee6463c4bfaac3f3029d9be9bdd6e93879323 of the config.git repository.
Signature · 1 line
2.20.1
#4 lore raw

PATCH 2/3 support/gnuconfig: add update script

In reply to Yann E. MORIN
---
 support/gnuconfig/README.buildroot | 14 ++++----------
 support/gnuconfig/update           | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100755 support/gnuconfig/update
support/gnuconfig/README.buildroot +4 -10
index 7e7d49830f..fbf0662543 100644
@@ -13,15 +13,9 @@ files of your package to be updated by using:
 <pkg>_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
 
 --- UPDATE ---
-GNU config is now managed in git, so to update:
+Run the script 'update' in this directory, and commit the result.
 
-# git clone git://git.savannah.gnu.org/config.git
-# cp config/config.* .
-# for p in $(ls patches/*.patch); do patch -p1 < $p; done
-# rm -rf config
+The current Buildroot version is based on this commit of the config.git
+repository (leave alone on its own line, the script updates it):
 
-Currently no patches are needed, but they may be needed again in the
-future.
-
-The current Buildroot version is based on the Git commit
-104ee6463c4bfaac3f3029d9be9bdd6e93879323 of the config.git repository.
+104ee6463c4bfaac3f3029d9be9bdd6e93879323
support/gnuconfig/update new file +14 -0
new file mode 100755
index 0000000000..c8728eadd2
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "${0%/*}"
+
+git clone https://git.savannah.gnu.org/git/config.git
+sha="$(cd config; git log -1 --pretty=tformat:%H)"
+sed -r -i -e "\$s/.*/${sha}/" README.buildroot
+cp config/config.* .
+for p in $(ls patches/*.patch 2>/dev/null); do
+    patch -p1 < "${p}"
+done
+rm -rf config
Signature · 1 line
2.20.1
#6 lore raw

PATCH 3/3 support/gnuconfig: update

In reply to Yann E. MORIN
---
 support/gnuconfig/README.buildroot |  2 +-
 support/gnuconfig/config.guess     | 80 ++++++++++++++++++------------
 support/gnuconfig/config.sub       | 37 ++++++--------
 3 files changed, 65 insertions(+), 54 deletions(-)
support/gnuconfig/README.buildroot +1 -1
index fbf0662543..3b59510fa5 100644
@@ -18,4 +18,4 @@ Run the script 'update' in this directory, and commit the result.
 The current Buildroot version is based on this commit of the config.git
 repository (leave alone on its own line, the script updates it):
 
-104ee6463c4bfaac3f3029d9be9bdd6e93879323
+e78c96e5288993aaea3ec44e5c6ee755c668da79
support/gnuconfig/config.guess +48 -32

144 lines not on this page · raw message

support/gnuconfig/config.sub +16 -21
index 5b158ac41c..973a2980ac 100755
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2019 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2019-05-23'
+timestamp='2020-05-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ Report bugs and patches to <[email protected]>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2019 Free Software Foundation, Inc.
+Copyright 1992-2020 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -337,17 +337,14 @@ case $1 in
 				basic_machine=m88k-harris
 				os=sysv3
 				;;
-			hp300)
-				basic_machine=m68k-hp
-				;;
-			hp300bsd)
-				basic_machine=m68k-hp
-				os=bsd
-				;;
-			hp300hpux)
+			hp300 | hp300hpux)
 				basic_machine=m68k-hp
 				os=hpux
 				;;
+			hp300bsd)
+				basic_machine=m68k-hp
+				os=bsd
+				;;
 			hppaosf)
 				basic_machine=hppa1.1-hp
 				os=osf
@@ -360,10 +357,6 @@ case $1 in
 				basic_machine=i386-mach
 				os=mach
 				;;
-			vsta)
-				basic_machine=i386-pc
-				os=vsta
-				;;
 			isi68 | isi)
 				basic_machine=m68k-isi
 				os=sysv
@@ -612,6 +605,10 @@ case $1 in
 				basic_machine=vax-dec
 				os=vms
 				;;
+			vsta)
+				basic_machine=i386-pc
+				os=vsta
+				;;
 			vxworks960)
 				basic_machine=i960-wrs
 				os=vxworks
@@ -1346,11 +1343,11 @@ case $os in
 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
 	     | sym* | kopensolaris* | plan9* \
 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-	     | aos* | aros* | cloudabi* | sortix* \
+	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
 	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
 	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
 	     | knetbsd* | mirbsd* | netbsd* \
-	     | bitrig* | openbsd* | solidbsd* | libertybsd* \
+	     | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
 	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
 	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
 	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
@@ -1368,7 +1365,8 @@ case $os in
 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+	     | nsk* | powerunix* | genode*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	qnx*)
@@ -1452,9 +1450,6 @@ case $os in
 	ns2)
 		os=nextstep2
 		;;
-	nsk*)
-		os=nsk
-		;;
 	# Preserve the version number of sinix5.
 	sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/3 support/gnuconfig: reference the correct sha1 we're using

In reply to Yann E. MORIN
Quoted 11 lines · On Sat, 9 May 2020 13:00:37 +0200 "Yann E. MORIN" <[email protected]>…

In commit ff9f778c66f4 (support/gnuconfig: update to 2019-05-28), we forgot to update the README to reference the sha1 we're using, keeping the old one from 2016...

Update it now.

Cc Thomas Petazzoni <[email protected]>
---
 support/gnuconfig/README.buildroot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 2/3 support/gnuconfig: add update script

In reply to Yann E. MORIN
Quoted 6 lines · On Sat, 9 May 2020 13:00:38 +0200 "Yann E. MORIN" <[email protected]>…
---
 support/gnuconfig/README.buildroot | 14 ++++----------
 support/gnuconfig/update           | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100755 support/gnuconfig/update

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#7 lore raw

PATCH 3/3 support/gnuconfig: update

In reply to Yann E. MORIN
Quoted 6 lines · On Sat, 9 May 2020 13:00:39 +0200 "Yann E. MORIN" <[email protected]>…
---
 support/gnuconfig/README.buildroot |  2 +-
 support/gnuconfig/config.guess     | 80 ++++++++++++++++++------------
 support/gnuconfig/config.sub       | 37 ++++++--------
 3 files changed, 65 insertions(+), 54 deletions(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/3 support/gnuconfig: reference the correct sha1 we're using

In reply to Yann E. MORIN
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

In commit ff9f778c66f4 (support/gnuconfig: update to 2019-05-28), we forgot to update the README to reference the sha1 we're using, keeping the old one from 2016...

Update it now.

Cc Thomas Petazzoni <[email protected]>

Committed to 2020.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard