Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -5,6 +5,8 @@ Subject: Do not create backup of old installed binary
|
||||
This is a rather unusual feature that packagers will not expect.
|
||||
|
||||
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
|
||||
[baruch: update for 4.6.2]
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Makefile.in | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
@@ -16,7 +18,7 @@ index 187a69b..65549e9 100644
|
||||
@@ -83,12 +83,9 @@ screen: $(OFILES)
|
||||
$(OPTIONS) $(CFLAGS) $<
|
||||
|
||||
install_bin: .version screen
|
||||
install_bin: .version screen installdirs
|
||||
- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
|
||||
- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
|
||||
$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From: Maarten ter Huurne <maarten@treewalker.org>
|
||||
Date: Mon, 15 Sep 2014 02:27:09 +0200
|
||||
Subject: Ensure that installation dirs exist before copying files into them
|
||||
|
||||
Since the "install_bin" target requires the installation directories
|
||||
to exist, it should depend on the "installdirs" target. The previous
|
||||
approach of having "install" depend on "installdirs" is not reliable.
|
||||
|
||||
For example, in a parallel build, there was no guarantee that
|
||||
"installdirs" would be finished before "install_bin" runs. Also if
|
||||
the user requested only "install_bin" to be made, "installdirs" would
|
||||
be skipped altogether.
|
||||
|
||||
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
|
||||
---
|
||||
Makefile.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 860f351..f0fe08d 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -82,7 +82,7 @@ screen: $(OFILES)
|
||||
$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(CPPFLAGS) $(DEFS) \
|
||||
$(OPTIONS) $(CFLAGS) $<
|
||||
|
||||
-install_bin: .version screen
|
||||
+install_bin: .version screen installdirs
|
||||
$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
-chown root $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
-chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
@@ -94,7 +94,7 @@ endif
|
||||
cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
|
||||
|
||||
###############################################################################
|
||||
-install: installdirs install_bin
|
||||
+install: install_bin
|
||||
cd doc ; $(MAKE) install
|
||||
-if [ -d /usr/lib/terminfo ]; then \
|
||||
PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
|
||||
--
|
||||
1.8.4.5
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gerwitz <mike@mikegerwitz.com>
|
||||
Date: Tue, 24 Dec 2013 22:16:31 -0500
|
||||
Subject: comm.h now depends on term.h
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Patch retrieved and updated from:
|
||||
http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c]
|
||||
---
|
||||
src/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index e791e79..d4f7c0b 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -113,7 +113,7 @@ term.h: term.c term.sh
|
||||
|
||||
kmapdef.c: term.h
|
||||
|
||||
-comm.h: comm.c comm.sh config.h
|
||||
+comm.h: comm.c comm.sh config.h term.h
|
||||
AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
|
||||
|
||||
docs:
|
||||
--
|
||||
cgit v1.0-41-gc330
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From b719314d201a3e9e1e57c65746a468c47bfc847f Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Wed, 3 Oct 2018 22:29:32 +0200
|
||||
Subject: [PATCH] comm.h needed for list_{display,generic}.o
|
||||
|
||||
comm.h is needed to build list_display.o and list_generic.o otherwise
|
||||
parallel builds will sometimes fail
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/43105f14857dbe72d8878fc7b3db67f7bdca93cc
|
||||
- http://autobuild.buildroot.org/results/47f4ecbec1355285633df287fc9c4e7cccde9378
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://savannah.gnu.org/bugs/index.php?54776]
|
||||
---
|
||||
Makefile.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index af5938b..e6d5247 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -265,7 +265,7 @@ braille.h
|
||||
viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \
|
||||
comm.h layer.h term.h image.h display.h window.h extern.h \
|
||||
braille.h
|
||||
-list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
|
||||
-list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
|
||||
+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h
|
||||
+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h
|
||||
list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -3,11 +3,12 @@ config BR2_PACKAGE_SCREEN
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_NCURSES
|
||||
help
|
||||
Screen is a full-screen window manager that multiplexes a physical
|
||||
terminal between several processes, typically interactive shells.
|
||||
Each virtual terminal provides the functions of the DEC VT100
|
||||
terminal and, in addition, several control functions from the ANSI
|
||||
X3.64 (ISO 6429) and ISO 2022 standards (e.g., insert/delete line
|
||||
and support for multiple character sets).
|
||||
Screen is a full-screen window manager that multiplexes a
|
||||
physical terminal between several processes, typically
|
||||
interactive shells. Each virtual terminal provides the
|
||||
functions of the DEC VT100 terminal and, in addition,
|
||||
several control functions from the ANSI X3.64 (ISO 6429) and
|
||||
ISO 2022 standards (e.g., insert/delete line and support for
|
||||
multiple character sets).
|
||||
|
||||
http://www.gnu.org/software/screen/
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 01c3a7c362185f35d6a95dff52d64337076496acd034d717de3c263500cfefb0 screen-4.5.0.tar.gz
|
||||
# https://ftp.gnu.org/gnu/screen/screen-4.6.2.tar.gz.sig
|
||||
sha256 1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a screen-4.6.2.tar.gz
|
||||
# Locally calculated
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SCREEN_VERSION = 4.5.0
|
||||
SCREEN_VERSION = 4.6.2
|
||||
SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
|
||||
SCREEN_LICENSE = GPLv3+
|
||||
SCREEN_LICENSE = GPL-3.0+
|
||||
SCREEN_LICENSE_FILES = COPYING
|
||||
SCREEN_DEPENDENCIES = ncurses
|
||||
SCREEN_AUTORECONF = YES
|
||||
|
||||
Reference in New Issue
Block a user