summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-07-26 17:36:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 14:18:42 +0100
commit85734f44c9e99f4134eec9b64fd90aba1ded1d2e (patch)
tree1603020a6369c9e899f6c8ad96f1e955b2d9993b
parentc42bff2e0718c40d87b91672bec76c63e4c91c0a (diff)
downloadopenembedded-core-85734f44c9e99f4134eec9b64fd90aba1ded1d2e.tar.gz
openembedded-core-85734f44c9e99f4134eec9b64fd90aba1ded1d2e.tar.bz2
openembedded-core-85734f44c9e99f4134eec9b64fd90aba1ded1d2e.zip
gawk: cleanup update-alternatives deprecated code
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-extended/gawk/gawk_3.1.5.bb7
-rw-r--r--meta/recipes-extended/gawk/gawk_4.0.1.bb7
2 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/meta/recipes-extended/gawk/gawk_3.1.5.bb
index 89dd01ce7f..5500974661 100644
--- a/meta/recipes-extended/gawk/gawk_3.1.5.bb
+++ b/meta/recipes-extended/gawk/gawk_3.1.5.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
RDEPENDS_gawk += "gawk-common"
RDEPENDS_pgawk += "gawk-common"
-PR = "r1"
+PR = "r2"
SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
file://gawk-3.1.5_fix_for_automake-1.12.patch"
@@ -30,9 +30,8 @@ FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*"
FILES_pgawk = "${bindir}/pgawk*"
FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
-ALTERNATIVE_NAME = "awk"
-ALTERNATIVE_PATH = "gawk"
-ALTERNATIVE_LINK = "${bindir}/awk"
+ALTERNATIVE_${PN} = "awk"
+ALTERNATIVE_TARGET[awk] = "${bindir}/gawk"
ALTERNATIVE_PRIORITY = "100"
CFLAGS += "-D PROTOTYPES"
diff --git a/meta/recipes-extended/gawk/gawk_4.0.1.bb b/meta/recipes-extended/gawk/gawk_4.0.1.bb
index b986ebde83..fcd761984d 100644
--- a/meta/recipes-extended/gawk/gawk_4.0.1.bb
+++ b/meta/recipes-extended/gawk/gawk_4.0.1.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
RDEPENDS_gawk += "gawk-common"
RDEPENDS_pgawk += "gawk-common"
-PR = "r0"
+PR = "r1"
SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz"
@@ -28,9 +28,8 @@ FILES_pgawk = "${bindir}/pgawk*"
FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
FILES_dgawk = "${bindir}/dgawk*"
-ALTERNATIVE_NAME = "awk"
-ALTERNATIVE_PATH = "gawk"
-ALTERNATIVE_LINK = "${bindir}/awk"
+ALTERNATIVE_${PN} = "awk"
+ALTERNATIVE_TARGET[awk] = "${bindir}/gawk"
ALTERNATIVE_PRIORITY = "100"
do_install_append() {