[ptxdist] [PATCH 1/2] ckermit: Add a patch to fix build with glibc >= 2.28.

[ptxdist] [PATCH 1/2] ckermit: Add a patch to fix build with glibc >= 2.28.

[Björn Esser]

This patch keeps backwards compatibility with
older versions of glibc.

From: https://bugs.gentoo.org/669332

Signed-off-by: Björn Esser <b.esser@pengutronix.de>
---
 ...-add-variable-to-allow-external-wart.patch | 10 +++----
 .../0002-Fix-build-with-glibc-2.28.patch      | 29 +++++++++++++++++++
 patches/cku302/series                         |  3 +-
 3 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 patches/cku302/0002-Fix-build-with-glibc-2.28.patch

diff --git a/patches/cku302/0001-add-variable-to-allow-external-wart.patch b/patches/cku302/0001-add-variable-to-allow-external-wart.patch
index 290761c57..105b6d869 100644
--- a/patches/cku302/0001-add-variable-to-allow-external-wart.patch
+++ b/patches/cku302/0001-add-variable-to-allow-external-wart.patch
@@ -6,14 +6,14 @@ this fixes cross-compiling
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- makefile |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
+ makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/makefile b/makefile
-index 176bc4e..ba5e3ba 100644
+index 9efe2622d9fc..69bb6131c986 100644
 --- a/makefile
 +++ b/makefile
-@@ -920,6 +920,7 @@ CC= cc
+@@ -927,6 +927,7 @@ CC= cc
  CC2= cc
  MAKE= make
  SHELL=/bin/sh
@@ -21,7 +21,7 @@ index 176bc4e..ba5e3ba 100644
  
  ###########################################################################
  # (Ancient) UNIX V7-specific variables.
-@@ -1414,9 +1415,9 @@ ckclib.$(EXT): ckclib.c ckclib.h ckcdeb.h ckcasc.h ckcsym.h
+@@ -1421,9 +1422,9 @@ ckclib.$(EXT): ckclib.c ckclib.h ckcdeb.h ckcasc.h ckcsym.h
  
  ckcpro.$(EXT): ckcpro.c ckcker.h ckcdeb.h ckcsym.h ckcasc.h ckclib.h
  
diff --git a/patches/cku302/0002-Fix-build-with-glibc-2.28.patch b/patches/cku302/0002-Fix-build-with-glibc-2.28.patch
new file mode 100644
index 000000000..39415dabf
--- /dev/null
+++ b/patches/cku302/0002-Fix-build-with-glibc-2.28.patch
@@ -0,0 +1,29 @@
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <b.esser@pengutronix.de>
+Date: Mon, 6 Jan 2020 15:24:08 +0100
+Subject: [PATCH] Fix build with glibc >= 2.28.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch keeps backwards compatibility with older versions of glibc.
+
+From: https://bugs.gentoo.org/669332
+
+Signed-off-by: Björn Esser <b.esser@pengutronix.de>
+---
+ ckucmd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ckucmd.c b/ckucmd.c
+index 274dc2d6a061..d70770ec0f55 100644
+--- a/ckucmd.c
++++ b/ckucmd.c
+@@ -7370,7 +7370,7 @@ cmdconchk() {
+ 
+ /* Here we must look inside the stdin buffer - highly platform dependent */
+ 
+-#ifdef _IO_file_flags			/* Linux */
++#ifdef _IO_EOF_SEEN			/* Linux */
+     x = (int) ((stdin->_IO_read_end) - (stdin->_IO_read_ptr));
+     debug(F101,"cmdconchk _IO_file_flags","",x);
+ #else  /* _IO_file_flags */
diff --git a/patches/cku302/series b/patches/cku302/series
index d1bdfdfc1..09a7e0b01 100644
--- a/patches/cku302/series
+++ b/patches/cku302/series
@@ -1,4 +1,5 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 0001-add-variable-to-allow-external-wart.patch
-# 62307c69250ab9529434a6600a9b2bbe  - git-ptx-patches magic
+0002-Fix-build-with-glibc-2.28.patch
+# 86a9b3d8158aaa73154db330e5778b0f  - git-ptx-patches magic
-- 
2.24.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] ckermit: Move from staging into its original section.

[Björn Esser]

As we have fix for the failing build now, we can keep
the package in its previous location.

Signed-off-by: Björn Esser <b.esser@pengutronix.de>
---
 rules/ckermit.in      | 4 +---
 rules/host-ckermit.in | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/rules/ckermit.in b/rules/ckermit.in
index 72e5a4b07..0aa18a81c 100644
--- a/rules/ckermit.in
+++ b/rules/ckermit.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=communication
+## SECTION=communication
 
 config CKERMIT
 	tristate
diff --git a/rules/host-ckermit.in b/rules/host-ckermit.in
index effcdb6e4..0f4ac657f 100644
--- a/rules/host-ckermit.in
+++ b/rules/host-ckermit.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=hosttools_noprompt
+## SECTION=hosttools_noprompt
 
 config HOST_CKERMIT
 	tristate
-- 
2.24.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 2/2] ckermit: Move out of staging.

[Björn Esser]

As we have fix for the failing build now, we can keep
the package in its previous location.

Signed-off-by: Björn Esser <b.esser@pengutronix.de>
---
 rules/ckermit.in            | 7 +------
 rules/host-ckermit.in       | 4 +---
 rules/host-testframework.in | 2 --
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/rules/ckermit.in b/rules/ckermit.in
index 72e5a4b07..56d75080f 100644
--- a/rules/ckermit.in
+++ b/rules/ckermit.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=communication
+## SECTION=communication
 
 config CKERMIT
 	tristate
@@ -13,6 +11,3 @@ config CKERMIT
 	help
 	  Columbia Univ 'kermit' terminal program: Basic file transfer &
           terminal control.
-
-	  STAGING: remove in ptxdist-2020.06.0
-	  Old version that need to be updated. Fails to build with glibc-2.28.
diff --git a/rules/host-ckermit.in b/rules/host-ckermit.in
index effcdb6e4..0f4ac657f 100644
--- a/rules/host-ckermit.in
+++ b/rules/host-ckermit.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=hosttools_noprompt
+## SECTION=hosttools_noprompt
 
 config HOST_CKERMIT
 	tristate
diff --git a/rules/host-testframework.in b/rules/host-testframework.in
index e51251bbd..f993945eb 100644
--- a/rules/host-testframework.in
+++ b/rules/host-testframework.in
@@ -4,6 +4,4 @@ config HOST_TESTFRAMEWORK
 	tristate
 	prompt "host-side testing framework   "
 	select HOST_LRZSZ
-	# STAGING: remove in ptxdist-2020.06.0
-	depends on STAGING
 	select HOST_CKERMIT
-- 
2.24.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de