summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@gmail.com>2018-10-07 19:11:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-10 12:47:34 +0100
commit860d0edc20d11f2b74548db0f673a75032f61d87 (patch)
tree1ab2b8526af4fab47bf71e935f099e085b700bad
parent2d2a113227b191b97e61aef7d8fca5001ab006da (diff)
downloadpoky-860d0edc20d11f2b74548db0f673a75032f61d87.tar.gz
gptfdisk: Use PACKAGECONFIG to control ncurses and popt dependencies
gptfdisk uses a simple Makefile with no automatic detection of external library support. Use PACKAGECONFIG_CONFARGS and pass the make targets in EXTRA_OEMAKE. (From OE-Core rev: 9bed9927ef92f5fbd17aacf3c4bd56bec7bf023e) Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/fdisk/gptfdisk_1.0.4.bb15
1 files changed, 11 insertions, 4 deletions
diff --git a/meta/recipes-devtools/fdisk/gptfdisk_1.0.4.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.4.bb
index 4426a795e2..b043c96543 100644
--- a/meta/recipes-devtools/fdisk/gptfdisk_1.0.4.bb
+++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.4.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "GPT fdisk is a disk partitioning tool loosely modeled on Linux fd
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 5LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
6 6
7DEPENDS = "util-linux popt ncurses" 7DEPENDS = "util-linux"
8 8
9SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz" 9SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz"
10SRC_URI[md5sum] = "5ecc3c44913bb6b53d3708d1ac7ac295" 10SRC_URI[md5sum] = "5ecc3c44913bb6b53d3708d1ac7ac295"
@@ -13,13 +13,20 @@ SRC_URI[sha256sum] = "b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c
13UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/" 13UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/"
14UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/" 14UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/"
15 15
16EXTRA_OEMAKE = "'CC=${CC}' 'CXX=${CXX}'" 16EXTRA_OEMAKE = "'CC=${CC}' 'CXX=${CXX}' gdisk fixparts ${PACKAGECONFIG_CONFARGS}"
17
18PACKAGECONFIG ??= "ncurses popt"
19PACKAGECONFIG[ncurses] = "cgdisk,,ncurses"
20PACKAGECONFIG[popt] = "sgdisk,,popt"
17 21
18do_install() { 22do_install() {
19 install -d ${D}${sbindir} 23 install -d ${D}${sbindir}
20 install -m 0755 cgdisk ${D}${sbindir} 24 for f in cgdisk sgdisk; do
25 if [ -x $f ]; then
26 install -m 0755 $f ${D}${sbindir}
27 fi
28 done
21 install -m 0755 gdisk ${D}${sbindir} 29 install -m 0755 gdisk ${D}${sbindir}
22 install -m 0755 sgdisk ${D}${sbindir}
23 install -m 0755 fixparts ${D}${sbindir} 30 install -m 0755 fixparts ${D}${sbindir}
24} 31}
25 32