* [PATCH 01/19] tinylogin: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 15:12 ` Mark Hatle
2012-08-01 14:12 ` [PATCH 02/19] patch: " Morgan Little
` (18 subsequent siblings)
19 siblings, 1 reply; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-core/tinylogin/tinylogin_1.4.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/tinylogin/tinylogin_1.4.bb b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
index 195f0c7..b86141f 100644
--- a/meta/recipes-core/tinylogin/tinylogin_1.4.bb
+++ b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
@@ -7,7 +7,7 @@
and groups on an embedded system."
HOMEPAGE = "http://tinylogin.busybox.net/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM="file://LICENSE;md5=f1060fa3a366f098b5b1d8c2077ba269"
-PR = "r8"
+PR = "r9"
inherit update-alternatives
@@ -42,7 +42,7 @@
do_install_append () {
mv ${D}${base_sbindir}/getty ${D}${base_sbindir}/getty.${BPN}
}
-ALTERNATIVE_NAME = "getty"
-ALTERNATIVE_LINK = "${base_sbindir}/getty"
-ALTERNATIVE_PATH = "${base_sbindir}/getty.${BPN}"
+ALTERNATIVE_${PN} = "getty"
+ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty"
+ALTERNATIVE_TARGET[getty] = "${base_sbindir}/getty.${BPN}"
ALTERNATIVE_PRIORITY = "80"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 01/19] tinylogin: use new update-alternatives
2012-08-01 14:12 ` [PATCH 01/19] tinylogin: use new update-alternatives Morgan Little
@ 2012-08-01 15:12 ` Mark Hatle
0 siblings, 0 replies; 30+ messages in thread
From: Mark Hatle @ 2012-08-01 15:12 UTC (permalink / raw)
To: openembedded-core
On 8/1/12 9:12 AM, Morgan Little wrote:
>
> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> ---
> meta/recipes-core/tinylogin/tinylogin_1.4.bb | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-core/tinylogin/tinylogin_1.4.bb b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
> index 195f0c7..b86141f 100644
> --- a/meta/recipes-core/tinylogin/tinylogin_1.4.bb
> +++ b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
> @@ -7,7 +7,7 @@
> and groups on an embedded system."
> HOMEPAGE = "http://tinylogin.busybox.net/"
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM="file://LICENSE;md5=f1060fa3a366f098b5b1d8c2077ba269"
> -PR = "r8"
> +PR = "r9"
>
> inherit update-alternatives
>
> @@ -42,7 +42,7 @@
> do_install_append () {
> mv ${D}${base_sbindir}/getty ${D}${base_sbindir}/getty.${BPN}
> }
>
> -ALTERNATIVE_NAME = "getty"
> -ALTERNATIVE_LINK = "${base_sbindir}/getty"
> -ALTERNATIVE_PATH = "${base_sbindir}/getty.${BPN}"
> +ALTERNATIVE_${PN} = "getty"
> +ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty"
> +ALTERNATIVE_TARGET[getty] = "${base_sbindir}/getty.${BPN}"
> ALTERNATIVE_PRIORITY = "80"
>
The above will work.. but it would be better to (perhaps a second commit?):
remove the do_install_append, it is no longer necessary
Once you do that, then you may remove the "ALTERNARTIVE_TARGET[getty]" that you
added, as it will automatically be configured as such by the update-alternatives
class.
--Mark
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 02/19] patch: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
2012-08-01 14:12 ` [PATCH 01/19] tinylogin: use new update-alternatives Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 15:13 ` Mark Hatle
2012-08-01 14:12 ` [PATCH 03/19] ubootchart_svn: " Morgan Little
` (17 subsequent siblings)
19 siblings, 1 reply; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-devtools/patch/patch.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc
index 21c06c6..80e00f6 100644
--- a/meta/recipes-devtools/patch/patch.inc
+++ b/meta/recipes-devtools/patch/patch.inc
@@ -13,6 +13,6 @@
do_install_append () {
mv ${D}${bindir}/patch ${D}${bindir}/patch.${BPN}
}
-ALTERNATIVE_NAME = "patch"
-ALTERNATIVE_PATH = "patch.${BPN}"
+ALTERNATIVE_${PN} = "patch"
+ALTERNATIVE_TARGET[patch] = "$[bindir}/patch.${BPN}"
ALTERNATIVE_PRIORITY = "100"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 02/19] patch: use new update-alternatives
2012-08-01 14:12 ` [PATCH 02/19] patch: " Morgan Little
@ 2012-08-01 15:13 ` Mark Hatle
0 siblings, 0 replies; 30+ messages in thread
From: Mark Hatle @ 2012-08-01 15:13 UTC (permalink / raw)
To: openembedded-core
On 8/1/12 9:12 AM, Morgan Little wrote:
>
> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> ---
> meta/recipes-devtools/patch/patch.inc | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc
> index 21c06c6..80e00f6 100644
> --- a/meta/recipes-devtools/patch/patch.inc
> +++ b/meta/recipes-devtools/patch/patch.inc
> @@ -13,6 +13,6 @@
> do_install_append () {
> mv ${D}${bindir}/patch ${D}${bindir}/patch.${BPN}
> }
>
> -ALTERNATIVE_NAME = "patch"
> -ALTERNATIVE_PATH = "patch.${BPN}"
> +ALTERNATIVE_${PN} = "patch"
> +ALTERNATIVE_TARGET[patch] = "$[bindir}/patch.${BPN}"
> ALTERNATIVE_PRIORITY = "100"
>
See the previous.. the do_install_append should be removed, and once that is
done the alternative_target[patch] is no needed.
--Mark
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 03/19] ubootchart_svn: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
2012-08-01 14:12 ` [PATCH 01/19] tinylogin: use new update-alternatives Morgan Little
2012-08-01 14:12 ` [PATCH 02/19] patch: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 14:12 ` [PATCH 04/19] gawk: " Morgan Little
` (16 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-devtools/ubootchart/ubootchart_svn.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
index b49e94a..b752ab2 100644
--- a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
+++ b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
@@ -4,7 +4,7 @@
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
SRCREV = "12"
PV = "0.0+r${SRCPV}"
-PR = "r5"
+PR = "r6"
#RRECOMMENDS_${PN} = "acct"
@@ -17,9 +17,9 @@
S = "${WORKDIR}/trunk"
inherit update-alternatives
-ALTERNATIVE_NAME = "init"
-ALTERNATIVE_LINK = "${base_sbindir}/init"
-ALTERNATIVE_PATH = "${base_sbindir}/ubootchartd"
+ALTERNATIVE_${PN} = "init"
+ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init"
+ALTERNATIVE_TARGET[init] = "${base_sbindir}/ubootchartd"
ALTERNATIVE_PRIORITY = "70"
do_compile() {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 04/19] gawk: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (2 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 03/19] ubootchart_svn: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 14:12 ` [PATCH 05/19] less: " Morgan Little
` (15 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-extended/gawk/gawk_3.1.5.bb | 8 ++++----
meta/recipes-extended/gawk/gawk_4.0.1.bb | 8 ++++----
2 files changed, 8 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 89dd01c..00684e8 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,9 @@
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] = "gawk"
+ALTERNATIVE_LINK_NAME[awk] = "${bindir}/awk"
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 b986ebd..5cc3b7b 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,9 @@
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] = "gawk"
+ALTERNATIVE_LINK_NAME[awk] = "${bindir}/awk"
ALTERNATIVE_PRIORITY = "100"
do_install_append() {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 05/19] less: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (3 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 04/19] gawk: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 15:14 ` Mark Hatle
2012-08-01 14:12 ` [PATCH 06/19] mingetty: " Morgan Little
` (14 subsequent siblings)
19 siblings, 1 reply; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-extended/less/less_444.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/less/less_444.bb b/meta/recipes-extended/less/less_444.bb
index 146b4fd..d18293d 100644
--- a/meta/recipes-extended/less/less_444.bb
+++ b/meta/recipes-extended/less/less_444.bb
@@ -23,7 +23,7 @@
LICENSE = "GPLv3+ | BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE;md5=1237c0f825bb36122b0b2b486ffbe6be"
DEPENDS = "ncurses"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz"
@@ -37,6 +37,6 @@
do_install () {
mv ${D}${bindir}/less ${D}${bindir}/less.${BPN}
}
-ALTERNATIVE_NAME = "less"
-ALTERNATIVE_PATH = "less.${BPN}"
+ALTERNATIVE_${PN} = "less"
+ALTERNATIVE_TARGET[less] = "${bindir}/less.${BPN}"
ALTERNATIVE_PRIORITY = "100"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 05/19] less: use new update-alternatives
2012-08-01 14:12 ` [PATCH 05/19] less: " Morgan Little
@ 2012-08-01 15:14 ` Mark Hatle
0 siblings, 0 replies; 30+ messages in thread
From: Mark Hatle @ 2012-08-01 15:14 UTC (permalink / raw)
To: openembedded-core
On 8/1/12 9:12 AM, Morgan Little wrote:
>
> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> ---
> meta/recipes-extended/less/less_444.bb | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-extended/less/less_444.bb b/meta/recipes-extended/less/less_444.bb
> index 146b4fd..d18293d 100644
> --- a/meta/recipes-extended/less/less_444.bb
> +++ b/meta/recipes-extended/less/less_444.bb
> @@ -23,7 +23,7 @@
> LICENSE = "GPLv3+ | BSD-2-Clause"
> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> file://LICENSE;md5=1237c0f825bb36122b0b2b486ffbe6be"
> DEPENDS = "ncurses"
> -PR = "r2"
> +PR = "r3"
>
> SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz"
>
> @@ -37,6 +37,6 @@
> do_install () {
> mv ${D}${bindir}/less ${D}${bindir}/less.${BPN}
> }
>
> -ALTERNATIVE_NAME = "less"
> -ALTERNATIVE_PATH = "less.${BPN}"
> +ALTERNATIVE_${PN} = "less"
> +ALTERNATIVE_TARGET[less] = "${bindir}/less.${BPN}"
> ALTERNATIVE_PRIORITY = "100"
>
The mv in the do_install is not needed, once it is removed the
ALTERNATIVE_TARGET[LESS] is no longer needed either.
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 06/19] mingetty: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (4 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 05/19] less: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 14:12 ` [PATCH 07/19] mktemp: " Morgan Little
` (13 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-extended/mingetty/mingetty_1.08.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/mingetty/mingetty_1.08.bb b/meta/recipes-extended/mingetty/mingetty_1.08.bb
index fed5dfd..a0883a1 100644
--- a/meta/recipes-extended/mingetty/mingetty_1.08.bb
+++ b/meta/recipes-extended/mingetty/mingetty_1.08.bb
@@ -2,7 +2,7 @@
DESCRIPTION = " A compact getty program for virtual consoles only"
SECTION = "console/utils"
HOMEPAGE = "http://sourceforge.net/projects/mingetty/"
LICENSE = "GPLv2"
-PR = "r1"
+PR = "r2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e"
SRC_URI = "http://cdnetworks-kr-1.dl.sourceforge.net/project/mingetty/mingetty/${PV}/mingetty-${PV}.tar.gz"
@@ -20,7 +20,7 @@
do_install(){
inherit update-alternatives
-ALTERNATIVE_NAME = "getty"
-ALTERNATIVE_LINK = "${base_sbindir}/getty"
-ALTERNATIVE_PATH = "${base_sbindir}/mingetty"
+ALTERNATIVE_${PN} = "getty"
+ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty"
+ALTERNATIVE_TARGET[getty] = "${base_sbindir}/mingetty"
ALTERNATIVE_PRIORITY = "50"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 07/19] mktemp: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (5 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 06/19] mingetty: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 15:15 ` Mark Hatle
2012-08-01 14:12 ` [PATCH 08/19] msmtp: " Morgan Little
` (12 subsequent siblings)
19 siblings, 1 reply; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-extended/mktemp/mktemp_1.7.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb
index b3a3d51..57f0df3 100644
--- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
+++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb
@@ -5,7 +5,7 @@
SECTION = "console/utils"
LICENSE = "ISC"
LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${BPN}-${PV}.tar.gz \
file://disable-strip.patch \
@@ -25,7 +25,7 @@
do_install_append () {
rmdir ${D}${bindir}
}
-ALTERNATIVE_NAME = "mktemp"
-ALTERNATIVE_LINK = "${base_bindir}/mktemp"
-ALTERNATIVE_PATH = "${base_bindir}/mktemp.${BPN}"
+ALTERNATIVE_${PN} = "mktemp"
+ALTERNAITVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp"
+ALTERNATIVE_TARGET[mktemp] = "${base_bindir}/mktemp.${BPN}"
ALTERNATIVE_PRIORITY = "100"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 07/19] mktemp: use new update-alternatives
2012-08-01 14:12 ` [PATCH 07/19] mktemp: " Morgan Little
@ 2012-08-01 15:15 ` Mark Hatle
0 siblings, 0 replies; 30+ messages in thread
From: Mark Hatle @ 2012-08-01 15:15 UTC (permalink / raw)
To: openembedded-core
On 8/1/12 9:12 AM, Morgan Little wrote:
>
> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> ---
> meta/recipes-extended/mktemp/mktemp_1.7.bb | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb
> index b3a3d51..57f0df3 100644
> --- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
> +++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb
> @@ -5,7 +5,7 @@
> SECTION = "console/utils"
> LICENSE = "ISC"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4"
>
> -PR = "r2"
> +PR = "r3"
>
> SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${BPN}-${PV}.tar.gz \
> file://disable-strip.patch \
> @@ -25,7 +25,7 @@
> do_install_append () {
> rmdir ${D}${bindir}
> }
>
> -ALTERNATIVE_NAME = "mktemp"
> -ALTERNATIVE_LINK = "${base_bindir}/mktemp"
> -ALTERNATIVE_PATH = "${base_bindir}/mktemp.${BPN}"
> +ALTERNATIVE_${PN} = "mktemp"
> +ALTERNAITVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp"
> +ALTERNATIVE_TARGET[mktemp] = "${base_bindir}/mktemp.${BPN}"
> ALTERNATIVE_PRIORITY = "100"
>
Similar to the previous, figure out where mktemp.${BPN} is generated, the
update-alternatives will do it automatically.. Then ALTERNATIVE_TARGET[mktemp]
shouldn't be needed.
--Mark
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 08/19] msmtp: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (6 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 07/19] mktemp: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 14:12 ` [PATCH 09/19] sed: " Morgan Little
` (11 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-extended/msmtp/msmtp_1.4.24.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/msmtp/msmtp_1.4.24.bb b/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
index 2d2ee52..08566ca 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
+++ b/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
@@ -5,7 +5,7 @@
SECTION = "console/network"
LICENSE = "GPLv3"
DEPENDS = "zlib gnutls"
-PR = "r2"
+PR = "r3"
#COPYING or Licence
@@ -21,7 +21,7 @@
inherit gettext autotools update-alternatives
EXTRA_OECONF += "--without-gnome-keyring"
-ALTERNATIVE_NAME = "sendmail"
-ALTERNATIVE_PATH = "${bindir}/msmtp"
-ALTERNATIVE_LINK = "${sbindir}/sendmail"
+ALTERNATIVE_${PN} = "sendmail"
+ALTERNATIVE_TARGET[sendmail] = "${bindir}/msmtp"
+ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail"
ALTERNATIVE_PRIORITY = "100"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 09/19] sed: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (7 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 08/19] msmtp: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 15:16 ` Mark Hatle
2012-08-01 14:12 ` [PATCH 10/19] time: " Morgan Little
` (10 subsequent siblings)
19 siblings, 1 reply; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-extended/sed/sed_4.1.2.bb | 8 ++++----
meta/recipes-extended/sed/sed_4.2.1.bb | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
index 3455c20..cffbec3 100644
--- a/meta/recipes-extended/sed/sed_4.1.2.bb
+++ b/meta/recipes-extended/sed/sed_4.1.2.bb
@@ -4,7 +4,7 @@
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://sed/sed.h;beginline=1;endline=17;md5=e00ffd1837f298439a214fd197f6a407"
SECTION = "console/utils"
-PR = "r6"
+PR = "r7"
SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \
file://fix_return_type.patch \
@@ -22,9 +22,9 @@
do_install () {
rmdir ${D}${bindir}/
}
-ALTERNATIVE_NAME = "sed"
-ALTERNATIVE_PATH = "sed.${BPN}"
-ALTERNATIVE_LINK = "${base_bindir}/sed"
+ALTERNATIVE_${PN} = "sed"
+ALTERNATIVE_TARGET[sed] = "${base_bindir}/sed.${BPN}"
+ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed"
ALTERNATIVE_PRIORITY = "100"
BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/sed/sed_4.2.1.bb b/meta/recipes-extended/sed/sed_4.2.1.bb
index b39eca0..60d4b20 100644
--- a/meta/recipes-extended/sed/sed_4.2.1.bb
+++ b/meta/recipes-extended/sed/sed_4.2.1.bb
@@ -4,7 +4,7 @@
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://sed/sed.h;beginline=1;endline=17;md5=767ab3a06d7584f6fd0469abaec4412f"
SECTION = "console/utils"
-PR = "r3"
+PR = "r4"
SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz"
@@ -22,9 +22,9 @@
do_install () {
rmdir ${D}${bindir}/
}
-ALTERNATIVE_NAME = "sed"
-ALTERNATIVE_PATH = "sed.${BPN}"
-ALTERNATIVE_LINK = "${base_bindir}/sed"
+ALTERNATIVE_${PN} = "sed"
+ALTERNATIVE_TARGET[sed] = "${base_bindir}/sed.${BPN}"
+ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed"
ALTERNATIVE_PRIORITY = "100"
BBCLASSEXTEND = "native"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 09/19] sed: use new update-alternatives
2012-08-01 14:12 ` [PATCH 09/19] sed: " Morgan Little
@ 2012-08-01 15:16 ` Mark Hatle
0 siblings, 0 replies; 30+ messages in thread
From: Mark Hatle @ 2012-08-01 15:16 UTC (permalink / raw)
To: openembedded-core
On 8/1/12 9:12 AM, Morgan Little wrote:
>
> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> ---
> meta/recipes-extended/sed/sed_4.1.2.bb | 8 ++++----
> meta/recipes-extended/sed/sed_4.2.1.bb | 8 ++++----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
> index 3455c20..cffbec3 100644
> --- a/meta/recipes-extended/sed/sed_4.1.2.bb
> +++ b/meta/recipes-extended/sed/sed_4.1.2.bb
> @@ -4,7 +4,7 @@
> LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> file://sed/sed.h;beginline=1;endline=17;md5=e00ffd1837f298439a214fd197f6a407"
> SECTION = "console/utils"
> -PR = "r6"
> +PR = "r7"
>
> SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \
> file://fix_return_type.patch \
> @@ -22,9 +22,9 @@
> do_install () {
> rmdir ${D}${bindir}/
> }
>
> -ALTERNATIVE_NAME = "sed"
> -ALTERNATIVE_PATH = "sed.${BPN}"
> -ALTERNATIVE_LINK = "${base_bindir}/sed"
> +ALTERNATIVE_${PN} = "sed"
> +ALTERNATIVE_TARGET[sed] = "${base_bindir}/sed.${BPN}"
> +ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed"
> ALTERNATIVE_PRIORITY = "100"
>
> BBCLASSEXTEND = "native"
> diff --git a/meta/recipes-extended/sed/sed_4.2.1.bb b/meta/recipes-extended/sed/sed_4.2.1.bb
> index b39eca0..60d4b20 100644
> --- a/meta/recipes-extended/sed/sed_4.2.1.bb
> +++ b/meta/recipes-extended/sed/sed_4.2.1.bb
> @@ -4,7 +4,7 @@
> LICENSE = "GPLv3+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
> file://sed/sed.h;beginline=1;endline=17;md5=767ab3a06d7584f6fd0469abaec4412f"
> SECTION = "console/utils"
> -PR = "r3"
> +PR = "r4"
>
> SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz"
>
> @@ -22,9 +22,9 @@
> do_install () {
> rmdir ${D}${bindir}/
> }
>
> -ALTERNATIVE_NAME = "sed"
> -ALTERNATIVE_PATH = "sed.${BPN}"
> -ALTERNATIVE_LINK = "${base_bindir}/sed"
> +ALTERNATIVE_${PN} = "sed"
> +ALTERNATIVE_TARGET[sed] = "${base_bindir}/sed.${BPN}"
> +ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed"
> ALTERNATIVE_PRIORITY = "100"
>
> BBCLASSEXTEND = "native"
>
See previous emails.. the ${BPN} still isn't needed.
--Mark
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 10/19] time: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (8 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 09/19] sed: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 15:16 ` Mark Hatle
2012-08-01 14:12 ` [PATCH 11/19] wget: " Morgan Little
` (9 subsequent siblings)
19 siblings, 1 reply; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-extended/time/time.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/time/time.inc b/meta/recipes-extended/time/time.inc
index 8e35843..b7cedac 100644
--- a/meta/recipes-extended/time/time.inc
+++ b/meta/recipes-extended/time/time.inc
@@ -12,7 +12,7 @@
do_install_append () {
mv ${D}${bindir}/time ${D}${bindir}/time.${BPN}
}
-ALTERNATIVE_NAME = "time"
-ALTERNATIVE_LINK = "${bindir}/time"
-ALTERNATIVE_PATH = "${bindir}/time.${BPN}"
+ALTERNATIVE_${PN} = "time"
+ALTERNATIVE_LINK_NAME[time] = "${bindir}/time"
+ALTERNATIVE_TARGET[time] = "${bindir}/time.${BPN}"
ALTERNATIVE_PRIORITY = "100"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 10/19] time: use new update-alternatives
2012-08-01 14:12 ` [PATCH 10/19] time: " Morgan Little
@ 2012-08-01 15:16 ` Mark Hatle
0 siblings, 0 replies; 30+ messages in thread
From: Mark Hatle @ 2012-08-01 15:16 UTC (permalink / raw)
To: openembedded-core
On 8/1/12 9:12 AM, Morgan Little wrote:
>
> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> ---
> meta/recipes-extended/time/time.inc | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-extended/time/time.inc b/meta/recipes-extended/time/time.inc
> index 8e35843..b7cedac 100644
> --- a/meta/recipes-extended/time/time.inc
> +++ b/meta/recipes-extended/time/time.inc
> @@ -12,7 +12,7 @@
> do_install_append () {
> mv ${D}${bindir}/time ${D}${bindir}/time.${BPN}
> }
>
> -ALTERNATIVE_NAME = "time"
> -ALTERNATIVE_LINK = "${bindir}/time"
> -ALTERNATIVE_PATH = "${bindir}/time.${BPN}"
> +ALTERNATIVE_${PN} = "time"
> +ALTERNATIVE_LINK_NAME[time] = "${bindir}/time"
> +ALTERNATIVE_TARGET[time] = "${bindir}/time.${BPN}"
> ALTERNATIVE_PRIORITY = "100"
>
Remove the do_install_append, and then the ALTERNATIVE_TARGET[time] won't be needed.
--Mark
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 11/19] wget: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (9 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 10/19] time: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 15:16 ` Mark Hatle
2012-08-01 14:12 ` [PATCH 12/19] which: " Morgan Little
` (8 subsequent siblings)
19 siblings, 1 reply; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-extended/wget/wget.inc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 4e1e931..0047329 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -4,7 +4,7 @@
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "openssl"
-INC_PR = "r14"
+INC_PR = "r15"
inherit autotools gettext update-alternatives
@@ -14,7 +14,7 @@
do_install_append () {
mv ${D}${bindir}/wget ${D}${bindir}/wget.${BPN}
}
-ALTERNATIVE_NAME = "wget"
-ALTERNATIVE_LINK = "${bindir}/wget"
-ALTERNATIVE_PATH = "${bindir}/wget.${BPN}"
+ALTERNATIVE_${PN} = "wget"
+ALTERNATIVE_LINK_NAME[wget] = "${bindir}/wget"
+ALTERNATIVE_TARGET[wget] = "${bindir}/wget.${BPN}"
ALTERNATIVE_PRIORITY = "100"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 11/19] wget: use new update-alternatives
2012-08-01 14:12 ` [PATCH 11/19] wget: " Morgan Little
@ 2012-08-01 15:16 ` Mark Hatle
0 siblings, 0 replies; 30+ messages in thread
From: Mark Hatle @ 2012-08-01 15:16 UTC (permalink / raw)
To: openembedded-core
On 8/1/12 9:12 AM, Morgan Little wrote:
>
> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> ---
> meta/recipes-extended/wget/wget.inc | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
> index 4e1e931..0047329 100644
> --- a/meta/recipes-extended/wget/wget.inc
> +++ b/meta/recipes-extended/wget/wget.inc
> @@ -4,7 +4,7 @@
> LICENSE = "GPLv3"
> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> DEPENDS = "openssl"
>
> -INC_PR = "r14"
> +INC_PR = "r15"
>
> inherit autotools gettext update-alternatives
>
> @@ -14,7 +14,7 @@
> do_install_append () {
> mv ${D}${bindir}/wget ${D}${bindir}/wget.${BPN}
> }
>
> -ALTERNATIVE_NAME = "wget"
> -ALTERNATIVE_LINK = "${bindir}/wget"
> -ALTERNATIVE_PATH = "${bindir}/wget.${BPN}"
> +ALTERNATIVE_${PN} = "wget"
> +ALTERNATIVE_LINK_NAME[wget] = "${bindir}/wget"
> +ALTERNATIVE_TARGET[wget] = "${bindir}/wget.${BPN}"
> ALTERNATIVE_PRIORITY = "100"
>
Remove the do_install_append, and the ALTERNATIVE_TARGET[wget] won't be needed.
--Mark
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 12/19] which: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (10 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 11/19] wget: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 15:17 ` Mark Hatle
2012-08-01 14:12 ` [PATCH 13/19] metacity: " Morgan Little
` (7 subsequent siblings)
19 siblings, 1 reply; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-extended/which/which_2.18.bb | 6 +++---
meta/recipes-extended/which/which_2.20.bb | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-extended/which/which_2.18.bb b/meta/recipes-extended/which/which_2.18.bb
index d54e776..db2d7dc 100644
--- a/meta/recipes-extended/which/which_2.18.bb
+++ b/meta/recipes-extended/which/which_2.18.bb
@@ -9,7 +9,7 @@
BUGTRACKER = "n/a"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \
file://fix_name_conflict_group_member.patch"
@@ -30,7 +30,7 @@
do_install_append() {
mv ${D}/${bindir}/which ${D}/${bindir}/which.${BPN}
}
-ALTERNATIVE_NAME = "which"
-ALTERNATIVE_PATH = "which.${BPN}"
+ALTERNATIVE_${PN} = "which"
+ALTERNATIVE_TARGET[which] = "${bindir}/which.${BPN}"
ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/which/which_2.20.bb b/meta/recipes-extended/which/which_2.20.bb
index 9b43943..21b4bec 100644
--- a/meta/recipes-extended/which/which_2.20.bb
+++ b/meta/recipes-extended/which/which_2.20.bb
@@ -8,7 +8,7 @@
DEPENDS = "cwautomacros-native"
inherit autotools update-alternatives
-PR = "r2"
+PR = "r3"
EXTRA_OECONF = "--disable-iberty"
@@ -27,6 +27,6 @@
do_install() {
mv ${D}${bindir}/which ${D}${bindir}/which.${BPN}
}
-ALTERNATIVE_NAME = "which"
-ALTERNATIVE_PATH = "which.${BPN}"
+ALTERNATIVE_${PN} = "which"
+ALTERNATIVE_TARGET[which] = "${bindir}/which.${BPN}"
ALTERNATIVE_PRIORITY = "100"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 12/19] which: use new update-alternatives
2012-08-01 14:12 ` [PATCH 12/19] which: " Morgan Little
@ 2012-08-01 15:17 ` Mark Hatle
0 siblings, 0 replies; 30+ messages in thread
From: Mark Hatle @ 2012-08-01 15:17 UTC (permalink / raw)
To: openembedded-core
On 8/1/12 9:12 AM, Morgan Little wrote:
>
> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> ---
> meta/recipes-extended/which/which_2.18.bb | 6 +++---
> meta/recipes-extended/which/which_2.20.bb | 6 +++---
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-extended/which/which_2.18.bb b/meta/recipes-extended/which/which_2.18.bb
> index d54e776..db2d7dc 100644
> --- a/meta/recipes-extended/which/which_2.18.bb
> +++ b/meta/recipes-extended/which/which_2.18.bb
> @@ -9,7 +9,7 @@
> BUGTRACKER = "n/a"
> LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
>
> -PR = "r1"
> +PR = "r2"
>
> SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \
> file://fix_name_conflict_group_member.patch"
> @@ -30,7 +30,7 @@
> do_install_append() {
> mv ${D}/${bindir}/which ${D}/${bindir}/which.${BPN}
> }
>
> -ALTERNATIVE_NAME = "which"
> -ALTERNATIVE_PATH = "which.${BPN}"
> +ALTERNATIVE_${PN} = "which"
> +ALTERNATIVE_TARGET[which] = "${bindir}/which.${BPN}"
> ALTERNATIVE_PRIORITY = "100"
>
> diff --git a/meta/recipes-extended/which/which_2.20.bb b/meta/recipes-extended/which/which_2.20.bb
> index 9b43943..21b4bec 100644
> --- a/meta/recipes-extended/which/which_2.20.bb
> +++ b/meta/recipes-extended/which/which_2.20.bb
> @@ -8,7 +8,7 @@
> DEPENDS = "cwautomacros-native"
>
> inherit autotools update-alternatives
>
> -PR = "r2"
> +PR = "r3"
>
> EXTRA_OECONF = "--disable-iberty"
>
> @@ -27,6 +27,6 @@
> do_install() {
> mv ${D}${bindir}/which ${D}${bindir}/which.${BPN}
> }
>
> -ALTERNATIVE_NAME = "which"
> -ALTERNATIVE_PATH = "which.${BPN}"
> +ALTERNATIVE_${PN} = "which"
> +ALTERNATIVE_TARGET[which] = "${bindir}/which.${BPN}"
> ALTERNATIVE_PRIORITY = "100"
>
Remove the mv in do_install, and the ALTERNATIVE_TARGET[which] is no longer needed.
--Mark
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 13/19] metacity: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (11 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 12/19] which: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 14:12 ` [PATCH 14/19] matchbox-session: " Morgan Little
` (6 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-gnome/gnome/metacity_2.30.3.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-gnome/gnome/metacity_2.30.3.bb b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
index 6db19c4..cd1d94d 100644
--- a/meta/recipes-gnome/gnome/metacity_2.30.3.bb
+++ b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
@@ -5,7 +5,7 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils"
-PR = "r4"
+PR = "r5"
inherit gnome update-alternatives
@@ -13,9 +13,9 @@
SRC_URI += "file://crosscompile.patch"
SRC_URI[archive.md5sum] = "553784f376d96b902e19ff437cd5b339"
SRC_URI[archive.sha256sum] = "08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/metacity"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity"
+ALTERNATIVE_LINK_NAME[x-window-manager] = "${bindir}/x-window-manager"
ALTERNATIVE_PRIORITY = "10"
EXTRA_OECONF += "--disable-verbose \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 14/19] matchbox-session: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (12 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 13/19] metacity: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 14:12 ` [PATCH 15/19] matchbox-wm-2: " Morgan Little
` (5 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
.../matchbox-session/matchbox-session_0.1.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
index 3faa16c..3ac8735 100644
--- a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
+++ b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
@@ -11,13 +11,13 @@
RCONFLICTS_${PN} = "matchbox-common"
SRC_URI = "file://matchbox-session"
S = "${WORKDIR}"
-PR = "r2"
+PR = "r3"
inherit update-alternatives
-ALTERNATIVE_NAME = "x-session-manager"
-ALTERNATIVE_LINK = "${bindir}/x-session-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_${PN} = "x-session-manager"
+ALTERNATIVE_LINK_NAME[x-session-manager] = "${bindir}/x-session-manager"
+ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/matchbox-session"
ALTERNATIVE_PRIORITY = "10"
do_install() {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 15/19] matchbox-wm-2: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (13 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 14/19] matchbox-session: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 14:12 ` [PATCH 16/19] mini-x-session: " Morgan Little
` (4 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
.../matchbox-wm-2/matchbox-wm-2_git.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
index 8b162be..73dcce6 100644
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
@@ -7,7 +7,7 @@
DEPENDS = "virtual/libx11 libxext libxrender startup-notification expat gconf pa
SRCREV = "01fa5465743c9ee43d040350f4405d35293e4869"
PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager-2;protocol=git \
file://fix_makefile.patch \
@@ -20,9 +20,9 @@
inherit autotools pkgconfig update-alternatives
# Change this to x-session-manager->matchbox-session and put in
# matchbox-session, then change this to x-window-manager to
# matchbox-window-manager-2.
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/matchbox-window-manager"
+ALTERNATIVE_LINK_NAME[x-window-manager] = "${bindir}/x-window-manager"
ALTERNATIVE_PRIORITY = "10"
PACKAGES =+ "libmatchbox2"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 16/19] mini-x-session: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (14 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 15/19] matchbox-wm-2: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 14:12 ` [PATCH 17/19] mutter: " Morgan Little
` (3 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
.../mini-x-session/mini-x-session_0.1.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
index bc9368a..ab86165 100644
--- a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
+++ b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
@@ -2,7 +2,7 @@
DESCRIPTION = "Mini X session files for poky"
HOMEPAGE = "http://www.yoctoproject.org"
BUGTRACKER = "http://bugzilla.pokylinux.org"
-PR = "r2"
+PR = "r3"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938826b7487"
@@ -15,9 +15,9 @@
S = "${WORKDIR}"
inherit update-alternatives
-ALTERNATIVE_NAME = "x-session-manager"
-ALTERNATIVE_LINK = "${bindir}/x-session-manager"
-ALTERNATIVE_PATH = "${bindir}/mini-x-session"
+ALTERNATIVE_${PN} = "x-session-manager"
+ALTERNATIVE_LINK_NAME[x-session-manager] = "${bindir}/x-session-manager"
+ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/mini-x-session"
ALTERNATIVE_PRIORITY = "50"
do_install() {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 17/19] mutter: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (15 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 16/19] mini-x-session: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 14:12 ` [PATCH 18/19] powertop: " Morgan Little
` (2 subsequent siblings)
19 siblings, 0 replies; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-graphics/mutter/mutter.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
index 4b73d97..a03ad4b 100644
--- a/meta/recipes-graphics/mutter/mutter.inc
+++ b/meta/recipes-graphics/mutter/mutter.inc
@@ -5,9 +5,9 @@
DEPENDS = "startup-notification gtk+ gconf clutter-1.8 gdk-pixbuf-native intltoo
# gobject-introspection
inherit gnome update-alternatives
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/mutter"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_LINK_NAME[x-window-manager] = "${bindir}/x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/mutter"
ALTERNATIVE_PRIORITY = "11"
EXTRA_OECONF += "--disable-verbose \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 18/19] powertop: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (16 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 17/19] mutter: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 14:12 ` [PATCH 19/19] rxvt-unicode: " Morgan Little
2012-08-01 14:31 ` This is a series of patches to update recipes that display warnings about the Martin Jansa
19 siblings, 0 replies; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-kernel/powertop/powertop_1.13.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-kernel/powertop/powertop_1.13.bb b/meta/recipes-kernel/powertop/powertop_1.13.bb
index b4f45dd..fd04b72 100644
--- a/meta/recipes-kernel/powertop/powertop_1.13.bb
+++ b/meta/recipes-kernel/powertop/powertop_1.13.bb
@@ -11,7 +11,7 @@
DEPENDS = "virtual/libintl ncurses"
# powertop 1.13 needs lspci
RDEPENDS_${PN} = "pciutils"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \
file://stub_out_the_ncurses_calls_in_dump_mode.patch \
@@ -26,9 +26,9 @@
EXTRA_OEMAKE = "VERSION=\"${PV}\" EXTRA_LIBS=${EXTRA_LIBS}"
EXTRA_LIBS_libc-uclibc = "-lintl"
inherit update-alternatives
-ALTERNATIVE_NAME = "powertop"
-ALTERNATIVE_PATH = "${bindir}/powertop"
-ALTERNATIVE_LINK = "${base_bindir}/powertop"
+ALTERNATIVE_${PN} = "powertop"
+ALTERNATIVE_TARGET[powertop] = "${bindir}/powertop"
+ALTERNATIVE_LINK_NAME[powertop] = "${base_bindir}/powertop"
ALTERNATIVE_PRIORITY = "100"
do_configure() {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 19/19] rxvt-unicode: use new update-alternatives
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (17 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 18/19] powertop: " Morgan Little
@ 2012-08-01 14:12 ` Morgan Little
2012-08-01 14:31 ` This is a series of patches to update recipes that display warnings about the Martin Jansa
19 siblings, 0 replies; 30+ messages in thread
From: Morgan Little @ 2012-08-01 14:12 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
.../recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb
index 2415ba5..ad63dd6 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb
@@ -10,7 +10,7 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
file://xwc.patch \
@@ -23,8 +23,9 @@
SRC_URI[sha256sum] = "ec1aa2932da844979ed8140bd92223defb12042aa5e877e05ac31139ca
inherit autotools update-alternatives
PROVIDES = "virtual/x-terminal-emulator"
-ALTERNATIVE_NAME = "x-terminal-emulator"
-ALTERNATIVE_PATH = "${bindir}/rxvt"
+
+ALTERNATIVE_${PN} = "x-terminal-emulator"
+ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt"
CFLAGS_append = " -fpermissive"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: This is a series of patches to update recipes that display warnings about the
2012-08-01 14:12 This is a series of patches to update recipes that display warnings about the Morgan Little
` (18 preceding siblings ...)
2012-08-01 14:12 ` [PATCH 19/19] rxvt-unicode: " Morgan Little
@ 2012-08-01 14:31 ` Martin Jansa
2012-08-01 14:40 ` Little, Morgan
19 siblings, 1 reply; 30+ messages in thread
From: Martin Jansa @ 2012-08-01 14:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3465 bytes --]
On Wed, Aug 01, 2012 at 10:12:01AM -0400, Morgan Little wrote:
> I compared the environment variables to make sure that they expanded out to
> the same variables so nothing should be changed during runtime.
>
> The following changes since commit 4029ce1a15e1dbd374444ee77ccf2a915e463b7b:
> Khem Raj (1):
> package_rpm.bbclass: Accomodate dash when using arrays
Is this complimentary to Saul's?
http://git.openembedded.org/openembedded-core-contrib/log/?h=sgw/update-alternatives
Looks like there is some overlap..
Cheers?
>
> are available in the git repository at:
>
> git@github.com:morganlittle/oe-core.git updatealternativesfixes
>
> Morgan Little (19):
> tinylogin: use new update-alternatives
> patch: use new update-alternatives
> ubootchart_svn: use new update-alternatives
> gawk: use new update-alternatives
> less: use new update-alternatives
> mingetty: use new update-alternatives
> mktemp: use new update-alternatives
> msmtp: use new update-alternatives
> sed: use new update-alternatives
> time: use new update-alternatives
> wget: use new update-alternatives
> which: use new update-alternatives
> metacity: use new update-alternatives
> matchbox-session: use new update-alternatives
> matchbox-wm-2: use new update-alternatives
> mini-x-session: use new update-alternatives
> mutter: use new update-alternatives
> powertop: use new update-alternatives
> rxvt-unicode: use new update-alternatives
>
> meta/recipes-core/tinylogin/tinylogin_1.4.bb | 8 ++++----
> meta/recipes-devtools/patch/patch.inc | 4 ++--
> meta/recipes-devtools/ubootchart/ubootchart_svn.bb | 8 ++++----
> meta/recipes-extended/gawk/gawk_3.1.5.bb | 8 ++++----
> meta/recipes-extended/gawk/gawk_4.0.1.bb | 8 ++++----
> meta/recipes-extended/less/less_444.bb | 6 +++---
> meta/recipes-extended/mingetty/mingetty_1.08.bb | 8 ++++----
> meta/recipes-extended/mktemp/mktemp_1.7.bb | 8 ++++----
> meta/recipes-extended/msmtp/msmtp_1.4.24.bb | 8 ++++----
> meta/recipes-extended/sed/sed_4.1.2.bb | 8 ++++----
> meta/recipes-extended/sed/sed_4.2.1.bb | 8 ++++----
> meta/recipes-extended/time/time.inc | 6 +++---
> meta/recipes-extended/wget/wget.inc | 8 ++++----
> meta/recipes-extended/which/which_2.18.bb | 6 +++---
> meta/recipes-extended/which/which_2.20.bb | 6 +++---
> meta/recipes-gnome/gnome/metacity_2.30.3.bb | 8 ++++----
> .../matchbox-session/matchbox-session_0.1.bb | 8 ++++----
> .../matchbox-wm-2/matchbox-wm-2_git.bb | 8 ++++----
> .../mini-x-session/mini-x-session_0.1.bb | 8 ++++----
> meta/recipes-graphics/mutter/mutter.inc | 6 +++---
> meta/recipes-kernel/powertop/powertop_1.13.bb | 8 ++++----
> .../recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb | 7 ++++---
> 22 files changed, 81 insertions(+), 80 deletions(-)
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: This is a series of patches to update recipes that display warnings about the
2012-08-01 14:31 ` This is a series of patches to update recipes that display warnings about the Martin Jansa
@ 2012-08-01 14:40 ` Little, Morgan
0 siblings, 0 replies; 30+ messages in thread
From: Little, Morgan @ 2012-08-01 14:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 12-08-01 10:31 AM, Martin Jansa wrote:
> On Wed, Aug 01, 2012 at 10:12:01AM -0400, Morgan Little wrote:
>> I compared the environment variables to make sure that they expanded out to
>> the same variables so nothing should be changed during runtime.
>>
>> The following changes since commit 4029ce1a15e1dbd374444ee77ccf2a915e463b7b:
>> Khem Raj (1):
>> package_rpm.bbclass: Accomodate dash when using arrays
>
> Is this complimentary to Saul's?
> http://git.openembedded.org/openembedded-core-contrib/log/?h=sgw/update-alternatives
>
> Looks like there is some overlap..
>
> Cheers?
I didn't notice his updates. His seems to have done everything I have and more. I think mine can be ignored if his is accepted.
//Morgan
>>
>
>> are available in the git repository at:
>>
>> git@github.com:morganlittle/oe-core.git updatealternativesfixes
>>
>> Morgan Little (19):
>> tinylogin: use new update-alternatives
>> patch: use new update-alternatives
>> ubootchart_svn: use new update-alternatives
>> gawk: use new update-alternatives
>> less: use new update-alternatives
>> mingetty: use new update-alternatives
>> mktemp: use new update-alternatives
>> msmtp: use new update-alternatives
>> sed: use new update-alternatives
>> time: use new update-alternatives
>> wget: use new update-alternatives
>> which: use new update-alternatives
>> metacity: use new update-alternatives
>> matchbox-session: use new update-alternatives
>> matchbox-wm-2: use new update-alternatives
>> mini-x-session: use new update-alternatives
>> mutter: use new update-alternatives
>> powertop: use new update-alternatives
>> rxvt-unicode: use new update-alternatives
>>
>> meta/recipes-core/tinylogin/tinylogin_1.4.bb | 8 ++++----
>> meta/recipes-devtools/patch/patch.inc | 4 ++--
>> meta/recipes-devtools/ubootchart/ubootchart_svn.bb | 8 ++++----
>> meta/recipes-extended/gawk/gawk_3.1.5.bb | 8 ++++----
>> meta/recipes-extended/gawk/gawk_4.0.1.bb | 8 ++++----
>> meta/recipes-extended/less/less_444.bb | 6 +++---
>> meta/recipes-extended/mingetty/mingetty_1.08.bb | 8 ++++----
>> meta/recipes-extended/mktemp/mktemp_1.7.bb | 8 ++++----
>> meta/recipes-extended/msmtp/msmtp_1.4.24.bb | 8 ++++----
>> meta/recipes-extended/sed/sed_4.1.2.bb | 8 ++++----
>> meta/recipes-extended/sed/sed_4.2.1.bb | 8 ++++----
>> meta/recipes-extended/time/time.inc | 6 +++---
>> meta/recipes-extended/wget/wget.inc | 8 ++++----
>> meta/recipes-extended/which/which_2.18.bb | 6 +++---
>> meta/recipes-extended/which/which_2.20.bb | 6 +++---
>> meta/recipes-gnome/gnome/metacity_2.30.3.bb | 8 ++++----
>> .../matchbox-session/matchbox-session_0.1.bb | 8 ++++----
>> .../matchbox-wm-2/matchbox-wm-2_git.bb | 8 ++++----
>> .../mini-x-session/mini-x-session_0.1.bb | 8 ++++----
>> meta/recipes-graphics/mutter/mutter.inc | 6 +++---
>> meta/recipes-kernel/powertop/powertop_1.13.bb | 8 ++++----
>> .../recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb | 7 ++++---
>> 22 files changed, 81 insertions(+), 80 deletions(-)
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 30+ messages in thread