mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-06 16:58:24 +00:00
Code Issues Projects Releases Wiki Activity

cpuid: fix do_install

Browse Source 
Fix do_install to make cpuid-doc installed correctly

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Changqing Li
2023-11-13 14:17:35 +08:00
committed by Armin Kuster
parent 7753dcdf9c
commit a26ff3abec
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta-oe/recipes-devtools/cpuid/cpuid_20211129.bb
View File

@@ -8,6 +8,7 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \ SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \
file://0001-Makefile-update-the-hardcode-path-to-bindir-mandir.patch \
" "
SRC_URI[sha256sum] = "230772bb88c44732e68a42d2eff43bcff46d893bf4ea6e04151d4cb6e8c88e2f" SRC_URI[sha256sum] = "230772bb88c44732e68a42d2eff43bcff46d893bf4ea6e04151d4cb6e8c88e2f"
@@ -15,9 +16,10 @@ COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
inherit perlnative inherit perlnative
# The install rule from the Makefile has hardcoded paths, so we duplicate
# the actions to accommodate different paths.
do_install () { do_install () {
install -D -m 0755 ${B}/cpuid ${D}/${bindir}/cpuid oe_runmake DESTDIR=${D} bindir=${bindir} mandir=${mandir} install
install -D -m 0444 ${B}/cpuid.man.gz ${D}/${mandir}
} }
RDEPENDS:${PN} = "perl"
INSANE_SKIP:${PN} += "already-stripped"

36
meta-oe/recipes-devtools/cpuid/files/0001-Makefile-update-the-hardcode-path-to-bindir-mandir.patch Normal file
View File

@@ -0,0 +1,36 @@
From 1339348c5b69b32378a638d65b16297d29c5fa22 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Tue, 7 Nov 2023 16:06:49 +0800
Subject: [PATCH] Makefile: update the hardcode path to bindir/mandir
Update the hardcode path to bindir/mandir
Upstream-Status: pending
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 828d2b1..365e26d 100644
--- a/Makefile
+++ b/Makefile
@@ -55,10 +55,10 @@ cpuinfo2cpuid.man.gz: cpuinfo2cpuid.man
gzip < $< > $@
install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
- install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
- install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
- install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid
- install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
+ install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)${bindir}/$(PROG)
+ install -D -m 444 $(PROG).man.gz $(BUILDROOT)${mandir}/man1/$(PROG).1.gz
+ install -D -m 755 cpuinfo2cpuid $(BUILDROOT)${bindir}/cpuinfo2cpuid
+ install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)${mandir}/man1/cpuinfo2cpuid.1.gz
clean:
rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
--
2.25.1