diff options
-rw-r--r-- | recipes-devtools/iotools/iotools/Makefile.patch | 24 | ||||
-rw-r--r-- | recipes-devtools/iotools/iotools_1.5.bb | 15 |
2 files changed, 34 insertions, 5 deletions
diff --git a/recipes-devtools/iotools/iotools/Makefile.patch b/recipes-devtools/iotools/iotools/Makefile.patch new file mode 100644 index 0000000..7ec67e0 --- /dev/null +++ b/recipes-devtools/iotools/iotools/Makefile.patch @@ -0,0 +1,24 @@ +From: Reinette Chatre <reinette.chatre@intel.com> +Date: Tue, 30 Aug 12:12:50 PDT 2016 +Subject: [PATCH] Makefile: only modify CC if unset + +When cross compiling bitbake sets the value of CC to correct compiler. + +Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ + VER_MAJOR = 1 + VER_MINOR = 5 + +-CC=$(CROSS_COMPILE)gcc ++CC ?= $(CROSS_COMPILE)gcc + + # build options + DEBUG ?= 1 +-- diff --git a/recipes-devtools/iotools/iotools_1.5.bb b/recipes-devtools/iotools/iotools_1.5.bb index c49bf8a..bc980fa 100644 --- a/recipes-devtools/iotools/iotools_1.5.bb +++ b/recipes-devtools/iotools/iotools_1.5.bb @@ -5,6 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/iotools/iotools-1.5.tar.gz" +SRC_URI += "file://Makefile.patch" SRC_URI[md5sum] = "64c27488a70866577cf99044aa01e28d" SRC_URI[sha256sum] = "3186ba296072f644dda881b78d77e3774b79e8cef3e828fffc947d558b08830d" @@ -17,9 +18,13 @@ do_compile () { do_install () { install -d ${D}${sbindir} - oe_runmake SBINDIR=${D}${sbindir} install - #The Makefile installs files with "cp -a" which preserves ownership - #of user running bitbake resulting in QA Issue "host-user-contaminated" - #Fixup permissions - chown -R root:root ${D}${sbindir} + install -m 0755 ${B}/iotools ${D}${sbindir}/iotools +} + +pkg_postinst_${PN} () { +if [ -n "$D" ]; then + exit 1 +fi + +${sbindir}/iotools --make-links } |