cross-elf2flt: install to pkgdir

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

6 files changed, 33 insertions, 5 deletions

diff --git a/patches/elf2flt-20161212-gbbe423fae32a/0001-ptxdist-don-t-move-real-ld-out-of-the-way.patch b/patches/elf2flt-20161212-gbbe423fae32a/0001-ptxdist-don-t-move-real-ld-out-of-the-way.patch
new file mode 100644
index 0000000..3a4439e
--- /dev/null
+++ b/patches/elf2flt-20161212-gbbe423fae32a/0001-ptxdist-don-t-move-real-ld-out-of-the-way.patch
@@ -0,0 +1,26 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 13 Jul 2019 13:47:25 +0200
+Subject: [PATCH] ptxdist: don't move real ld out of the way
+
+This is handled with PTXCONF_CROSS_BINUTILS_LD_REAL.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile.in | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a6feea67594d..6fae4dcc0209 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -112,10 +112,6 @@ install:
+ 	$(INSTALL) -m 755 $(PROG_FLTHDR) $(DESTDIR)$(target_bindir)/$(PROG_FLTHDR)
+ 	$(INSTALL) -m 755 $(PROG_ELF2FLT) $(DESTDIR)$(bindir)/$(TARGET)-$(PROG_ELF2FLT)
+ 	$(INSTALL) -m 755 $(PROG_ELF2FLT) $(DESTDIR)$(target_bindir)/$(PROG_ELF2FLT)
+-	[ -f $(DESTDIR)$(bindir)/$(TARGET)-ld.real$(EXEEXT) ] || \
+-		mv $(DESTDIR)$(bindir)/$(TARGET)-ld$(EXEEXT) $(DESTDIR)$(bindir)/$(TARGET)-ld.real$(EXEEXT)
+-	[ -f $(DESTDIR)$(target_bindir)/ld.real$(EXEEXT) ] || \
+-		mv $(DESTDIR)$(target_bindir)/ld$(EXEEXT) $(DESTDIR)$(target_bindir)/ld.real$(EXEEXT)
+ 	$(INSTALL) -m 755 $(PROG_LD_ELF2FLT) $(DESTDIR)$(bindir)/$(TARGET)-ld$(EXEEXT)
+ 	$(INSTALL) -m 755 $(PROG_LD_ELF2FLT) $(DESTDIR)$(target_bindir)/ld$(EXEEXT)
+ 	$(INSTALL) -m 644 $(SRC_LDFILE) $(DESTDIR)$(target_libdir)/$(LDFILE)
diff --git a/patches/elf2flt-20161212-gbbe423fae32a/series b/patches/elf2flt-20161212-gbbe423fae32a/series
new file mode 100644
index 0000000..b3dc025
--- /dev/null
+++ b/patches/elf2flt-20161212-gbbe423fae32a/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-ptxdist-don-t-move-real-ld-out-of-the-way.patch
+# c5b438e8ba2ee422166bef060ed952ea  - git-ptx-patches magic
diff --git a/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index 3eedaab..1cafef9 100644
--- a/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -48,6 +48,7 @@ PTXCONF_CROSS_BINUTILS_VERSION="2.32"
 PTXCONF_CROSS_BINUTILS_MD5="64f8ea283e571200f8b2b7f66fe8a0d6"
 PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
+PTXCONF_CROSS_BINUTILS_LD_REAL=y
 PTXCONF_CROSS_ELF2FLT=y
 PTXCONF_KERNEL_HEADERS=y
 PTXCONF_KERNEL_HEADERS_VERSION="5.0"
diff --git a/ptxconfigs/arm-v7m-uclinuxeabi_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v7m-uclinuxeabi_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index aafc969..5cc6c7c 100644
--- a/ptxconfigs/arm-v7m-uclinuxeabi_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7m-uclinuxeabi_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -48,6 +48,7 @@ PTXCONF_CROSS_BINUTILS_VERSION="2.32"
 PTXCONF_CROSS_BINUTILS_MD5="64f8ea283e571200f8b2b7f66fe8a0d6"
 PTXCONF_CROSS_BINUTILS_LICENSE="GPL-2.0-or-later AND LGPL-2.0-or-later GPL-3.0-or-later AND LGPL-3.0-or-later"
 PTXCONF_CROSS_BINUTILS_LICENSE_FILES="file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
+PTXCONF_CROSS_BINUTILS_LD_REAL=y
 PTXCONF_CROSS_ELF2FLT=y
 PTXCONF_KERNEL_HEADERS=y
 PTXCONF_KERNEL_HEADERS_VERSION="5.0"
diff --git a/rules/cross-elf2flt.in b/rules/cross-elf2flt.in
index dbb1e59..735f775 100644
--- a/rules/cross-elf2flt.in
+++ b/rules/cross-elf2flt.in
@@ -3,6 +3,7 @@
 config CROSS_ELF2FLT
 	tristate
 	select CROSS_BINUTILS
+	select CROSS_BINUTILS_LD_REAL
 	prompt "elf2flt"
 	help
 	  f2flt with PIC, ZFLAT and full reloc support. Currently supported
diff --git a/rules/cross-elf2flt.make b/rules/cross-elf2flt.make
index f85e38c..75dbc61 100644
--- a/rules/cross-elf2flt.make
+++ b/rules/cross-elf2flt.make
@@ -31,8 +31,6 @@ CROSS_ELF2FLT_LICENSE_FILES := \
 # Prepare
 # ----------------------------------------------------------------------------
 
-CROSS_ELF2FLT_DEVPKG	:= NO
-
 #
 # autoconf
 #
@@ -45,8 +43,5 @@ CROSS_ELF2FLT_CONF_OPT	:= \
 	--with-binutils-build-dir=$(CROSS_BINUTILS_BUILDDIR) \
 	--with-libbfd="$(CROSS_BINUTILS_BUILDDIR)/bfd/libbfd.a -lz -ldl"
 
-CROSS_ELF2FLT_INSTALL_OPT := \
-	prefix=$(PTXCONF_SYSROOT_CROSS) \
-	install
 
 # vim: syntax=make