mgetty: fix building for arm64

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 64 insertions, 38 deletions

diff --git a/patches/mgetty-1.1.36/fix-install.diff b/patches/mgetty-1.1.36/0001-fix-install.patch
index fe41dc2ce..774b3ac4c 100644
--- a/patches/mgetty-1.1.36/fix-install.diff
+++ b/patches/mgetty-1.1.36/0001-fix-install.patch
@@ -1,21 +1,21 @@
-Subject: [PATCH] fix install
 From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 15 Jan 2017 12:02:05 +0100
+Subject: [PATCH] fix install
 
 prefix all paths with DESTDIR when installing.
 install all necessary stuff
 don't chown dirs
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
 ---
- Makefile          |   77 ++++++++++++++++++++++++++++--------------------------
- callback/Makefile |    4 +-
- fax/Makefile      |   25 ++++++++---------
- g3/Makefile       |    4 +-
+ Makefile          | 77 +++++++++++++++++++++++++++++--------------------------
+ callback/Makefile |  4 +--
+ fax/Makefile      | 25 +++++++++---------
+ g3/Makefile       |  4 +--
  4 files changed, 57 insertions(+), 53 deletions(-)
 
-Index: b/Makefile
-===================================================================
+diff --git a/Makefile b/Makefile
+index 97ea1986dce9..401ae6e4b37b 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -580,56 +580,54 @@ install.bin: mgetty sendfax newslock \
@@ -123,27 +123,22 @@ Index: b/Makefile
  # compatibility
  #
  	if [ ! -z "$(INSTALL_MECHO)" ] ; then \
-Index: b/g3/Makefile
-===================================================================
---- a/g3/Makefile
-+++ b/g3/Makefile
-@@ -37,12 +37,12 @@ install: all
+diff --git a/callback/Makefile b/callback/Makefile
+index 061e63a9f966..577e0dfa6fe2 100644
+--- a/callback/Makefile
++++ b/callback/Makefile
+@@ -37,7 +37,7 @@ clean:
  # install programs
  #
- 	for f in $(G3_PROGRAMS) ; do \
--		$(INSTALL) -s -m 755 $$f $(BINDIR) ; \
-+		$(INSTALL) -s -m 755 $$f $(DESTDIR)$(BINDIR) ; \
- 	done
- #
- # make symlink for "g3topbm" (so third-party fax viewers won't fail)
- #
--	-cd $(BINDIR) ; \
-+	-cd $(DESTDIR)$(BINDIR) ; \
- 	test -x g3topbm || ln -s g32pbm g3topbm
- 
+ install: all
+-	$(INSTALL) -s -m 700 -o root callback $(SBINDIR)
+-	$(INSTALL) -s -m 4711 -o root ct $(BINDIR)
++	$(INSTALL) -s -m 700 -o root callback $(DESTDIR)$(SBINDIR)
++	$(INSTALL) -s -m 4711 -o root ct $(DESTDIR)$(BINDIR)
  
-Index: b/fax/Makefile
-===================================================================
+ # source modules
+diff --git a/fax/Makefile b/fax/Makefile
+index 89ceccb611f8..6438c0f8461c 100644
 --- a/fax/Makefile
 +++ b/fax/Makefile
 @@ -53,25 +53,24 @@ install: all
@@ -189,17 +184,22 @@ Index: b/fax/Makefile
  #
 -	$(INSTALL) -m 644 faxspool.rules $(CONFDIR)/faxspool.rules.sample
 +	$(INSTALL) -m 644 faxspool.rules $(DESTDIR)$(CONFDIR)/faxspool.rules.sample
-Index: b/callback/Makefile
-===================================================================
---- a/callback/Makefile
-+++ b/callback/Makefile
-@@ -37,7 +37,7 @@ clean:
+diff --git a/g3/Makefile b/g3/Makefile
+index 33082e1e9692..70e2f57cd534 100644
+--- a/g3/Makefile
++++ b/g3/Makefile
+@@ -37,12 +37,12 @@ install: all
  # install programs
  #
- install: all
--	$(INSTALL) -s -m 700 -o root callback $(SBINDIR)
--	$(INSTALL) -s -m 4711 -o root ct $(BINDIR)
-+	$(INSTALL) -s -m 700 -o root callback $(DESTDIR)$(SBINDIR)
-+	$(INSTALL) -s -m 4711 -o root ct $(DESTDIR)$(BINDIR)
+ 	for f in $(G3_PROGRAMS) ; do \
+-		$(INSTALL) -s -m 755 $$f $(BINDIR) ; \
++		$(INSTALL) -s -m 755 $$f $(DESTDIR)$(BINDIR) ; \
+ 	done
+ #
+ # make symlink for "g3topbm" (so third-party fax viewers won't fail)
+ #
+-	-cd $(BINDIR) ; \
++	-cd $(DESTDIR)$(BINDIR) ; \
+ 	test -x g3topbm || ln -s g32pbm g3topbm
+ 
  
- # source modules
diff --git a/patches/mgetty-1.1.36/0002-fix-building-on-arm64.patch b/patches/mgetty-1.1.36/0002-fix-building-on-arm64.patch
new file mode 100644
index 000000000..cd91ebee9
--- /dev/null
+++ b/patches/mgetty-1.1.36/0002-fix-building-on-arm64.patch
@@ -0,0 +1,22 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 15 Jan 2017 12:06:11 +0100
+Subject: [PATCH] fix building on arm64
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ mgetty.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mgetty.h b/mgetty.h
+index 14845207421a..811e5519d1b4 100644
+--- a/mgetty.h
++++ b/mgetty.h
+@@ -198,7 +198,7 @@ typedef unsigned char uch;
+  */
+ #if defined(__alpha__) || defined(__sparc64__) || \
+ 	    defined(__ia64__) || defined(__s390x__) || defined(__x86_64__) || \
+-	    defined(__powerpc64__)
++	    defined(__powerpc64__) || defined(__aarch64__)
+ # define PTR_IS_LONG
+ #endif
+ 
diff --git a/patches/mgetty-1.1.36/series b/patches/mgetty-1.1.36/series
index e34dd465a..a5754157a 100644
--- a/patches/mgetty-1.1.36/series
+++ b/patches/mgetty-1.1.36/series
@@ -1 +1,5 @@
-fix-install.diff
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fix-install.patch
+0002-fix-building-on-arm64.patch
+# fc05b6ed9561e1654fa95e4434ac515a  - git-ptx-patches magic