diff options
Diffstat (limited to 'meta/recipes-extended/hdparm')
| -rw-r--r-- | meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-extended/hdparm/hdparm_9.65.bb (renamed from meta/recipes-extended/hdparm/hdparm_9.52.bb) | 22 |
2 files changed, 50 insertions, 10 deletions
diff --git a/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch b/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch new file mode 100644 index 0000000000..4af1b617ed --- /dev/null +++ b/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch @@ -0,0 +1,38 @@ +From e233006ee212109d2a1401dac37a9a851cc493d8 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 14 Dec 2017 15:23:47 +0800 +Subject: [PATCH] wiper.sh: fix stat path + +Fix the stat path for OE. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + wiper/wiper.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/wiper/wiper.sh b/wiper/wiper.sh +index 79eddc8..9ef2840 100755 +--- a/wiper/wiper.sh ++++ b/wiper/wiper.sh +@@ -97,7 +97,6 @@ function find_prog(){ + hash -r ## Refresh bash's cached PATH entries + HDPARM=`find_prog /sbin/hdparm` || exit 1 + FIND=`find_prog /usr/bin/find` || exit 1 +-STAT=`find_prog /usr/bin/stat` || exit 1 + GAWK=`find_prog /usr/bin/gawk` || exit 1 + BLKID=`find_prog /sbin/blkid` || exit 1 + GREP=`find_prog /bin/grep` || exit 1 +@@ -105,7 +104,7 @@ ID=`find_prog /usr/bin/id` || exit 1 + LS=`find_prog /bin/ls` || exit 1 + DF=`find_prog /bin/df` || exit 1 + RM=`find_prog /bin/rm` || exit 1 +-STAT=`find_prog /usr/bin/stat` || exit 1 ++STAT=`find_prog /bin/stat` || exit 1 + + [ $verbose -gt 1 ] && HDPARM="$HDPARM --verbose" + +-- +2.7.4 + diff --git a/meta/recipes-extended/hdparm/hdparm_9.52.bb b/meta/recipes-extended/hdparm/hdparm_9.65.bb index 49fdc941a5..d5e6ab6065 100644 --- a/meta/recipes-extended/hdparm/hdparm_9.52.bb +++ b/meta/recipes-extended/hdparm/hdparm_9.65.bb @@ -4,10 +4,11 @@ DESCRIPTION = "hdparm is a Linux shell utility for viewing \ and manipulating various IDE drive and driver parameters." SECTION = "console/utils" -LICENSE = "BSD & GPLv2" -LICENSE_${PN} = "BSD" -LICENSE_${PN}-dbg = "BSD" -LICENSE_wiper = "GPLv2" +LICENSE = "BSD-2-Clause & GPL-2.0-only & hdparm" +LICENSE:${PN} = "BSD-2-Clause & hdparm" +LICENSE:${PN}-dbg = "BSD-2-Clause & hdparm" +LICENSE:wiper = "GPL-2.0-only" +NO_GENERIC_LICENSE[hdparm] = "LICENSE.TXT" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=495d03e50dc6c89d6a30107ab0df5b03 \ file://debian/copyright;md5=a82d7ba3ade9e8ec902749db98c592f3 \ @@ -17,20 +18,21 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=495d03e50dc6c89d6a30107ab0df5b03 \ PACKAGES =+ "wiper" -FILES_wiper = "${bindir}/wiper.sh" +FILES:wiper = "${bindir}/wiper.sh" -RDEPENDS_wiper = "bash gawk stat" +RDEPENDS:wiper = "bash gawk coreutils" -SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \ + file://wiper.sh-fix-stat-path.patch \ + " -SRC_URI[md5sum] = "410539d0bf3cc247181594581edbfb53" -SRC_URI[sha256sum] = "c3429cd423e271fa565bf584598fd751dd2e773bb7199a592b06b5a61cec4fb6" +SRC_URI[sha256sum] = "d14929f910d060932e717e9382425d47c2e7144235a53713d55a94f7de535a4b" EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"' inherit update-alternatives -ALTERNATIVE_${PN} = "hdparm" +ALTERNATIVE:${PN} = "hdparm" ALTERNATIVE_LINK_NAME[hdparm] = "${base_sbindir}/hdparm" ALTERNATIVE_PRIORITY = "100" |