linux-atm: Add knob to root prefix

Fixes build with usrmerge

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2022-04-23 10:23:31 -07:00
parent 8cec1f1fd9
commit d69c0da9d2
2 changed files with 34 additions and 4 deletions

View File

@ -0,0 +1,31 @@
From 94cb952207e44a5c29578c9c56912190a5422876 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 23 Apr 2022 09:41:51 -0700
Subject: [PATCH] make: Add PREFIX knob
This will be used to pass appropriate root prefix which is different
when using usrmerge
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/extra/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/src/extra/Makefile.am
+++ b/src/extra/Makefile.am
@@ -8,10 +8,10 @@ BUILT_SOURCES = pca200e.bin pca200e_ecd.
CLEANFILES = pca200e.bin pca200e_ecd.bin2 sba200e_ecd.bin2
install-exec-hook:
- $(MKDIR_P) $(DESTDIR)/lib/firmware
- $(INSTALL_DATA) $(builddir)/pca200e.bin $(DESTDIR)/lib/firmware
- $(INSTALL_DATA) $(builddir)/pca200e_ecd.bin2 $(DESTDIR)/lib/firmware
- $(INSTALL_DATA) $(builddir)/sba200e_ecd.bin2 $(DESTDIR)/lib/firmware
+ $(MKDIR_P) $(DESTDIR)$(ROOTPREFIX)/lib/firmware
+ $(INSTALL_DATA) $(builddir)/pca200e.bin $(DESTDIR)$(ROOTPREFIX)/lib/firmware
+ $(INSTALL_DATA) $(builddir)/pca200e_ecd.bin2 $(DESTDIR)$(ROOTPREFIX)/lib/firmware
+ $(INSTALL_DATA) $(builddir)/sba200e_ecd.bin2 $(DESTDIR)$(ROOTPREFIX)/lib/firmware
%.bin %.bin2: %.data
objcopy -Iihex $< -Obinary $@.gz

View File

@ -13,11 +13,11 @@ SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${P
file://0003-mpoad-Drop-old-hack-to-compile-with-very-old-glibc.patch \
file://0001-IFNAMSIZ-is-defined-in-net-if.h.patch \
file://0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch \
file://0001-make-Add-PREFIX-knob.patch \
"
SRC_URI:append:libc-musl = " file://musl-no-on_exit.patch"
SRC_URI[md5sum] = "d49499368c3cf15f73a05d9bce8824a8"
SRC_URI[sha256sum] = "9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a"
LIC_FILES_CHKSUM = "\
@ -27,7 +27,6 @@ file://COPYING.LGPL;md5=6e29c688d912da12b66b73e32b03d812"
inherit autotools pkgconfig
# The firmware is explicitly put under /lib when installed.
#
EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}"
FILES:${PN} += "/lib/firmware"
FILES:${PN} += "${nonarch_base_libdir}/firmware"