* [PATCH 1/3] opkg-utils: Upgrade to latest git HEAD
2014-01-15 2:17 [PATCH 0/3] Change update-alternatives provider Paul Barker
@ 2014-01-15 2:17 ` Paul Barker
2014-01-15 10:04 ` Koen Kooi
2014-01-15 2:17 ` [PATCH 2/3] default-providers: Change update-alternatives provider to opkg-utils Paul Barker
` (2 subsequent siblings)
3 siblings, 1 reply; 12+ messages in thread
From: Paul Barker @ 2014-01-15 2:17 UTC (permalink / raw)
To: openembedded-core
The latest version of opkg-utils PROVIDES virtual/update-alternatives via a
script copied from opkg.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 714fc51..4ae6970 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -4,8 +4,10 @@ HOMEPAGE = "http://code.google.com/p/opkg/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
+PROVIDES += "virtual/update-alternatives"
+RPROVIDES_update-alternatives-opkg = "update-alternatives"
-SRCREV = "757a1664a440c60e8126443bf984e4bdf374c327"
+SRCREV = "fd4a3a4c20ada47b19e89849ddb6ff87904f01d2"
PV = "0.1.8+git${SRCPV}"
SRC_URI = "git://git.yoctoproject.org/opkg-utils"
@@ -21,6 +23,9 @@ do_install() {
# Avoid circular dependencies from package_ipk.bbclass
PACKAGES_class-native = ""
+PACKAGES =+ "update-alternatives-opkg"
+FILES_update-alternatives-opkg = "${bindir}/update-alternatives"
+
RDEPENDS_${PN} = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold"
RDEPENDS_${PN}_class-native = ""
--
1.8.5.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 1/3] opkg-utils: Upgrade to latest git HEAD
2014-01-15 2:17 ` [PATCH 1/3] opkg-utils: Upgrade to latest git HEAD Paul Barker
@ 2014-01-15 10:04 ` Koen Kooi
2014-01-15 16:16 ` Paul Barker
0 siblings, 1 reply; 12+ messages in thread
From: Koen Kooi @ 2014-01-15 10:04 UTC (permalink / raw)
To: Paul Barker; +Cc: openembedded-core
Op 15 jan. 2014, om 03:17 heeft Paul Barker <paul@paulbarker.me.uk> het volgende geschreven:
> The latest version of opkg-utils PROVIDES virtual/update-alternatives via a
> script copied from opkg.
>
> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> ---
> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> index 714fc51..4ae6970 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> @@ -4,8 +4,10 @@ HOMEPAGE = "http://code.google.com/p/opkg/"
> LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
> +PROVIDES += "virtual/update-alternatives"
> +RPROVIDES_update-alternatives-opkg = "update-alternatives"
R* variables do below do_install since they deal with packaging
>
> -SRCREV = "757a1664a440c60e8126443bf984e4bdf374c327"
> +SRCREV = "fd4a3a4c20ada47b19e89849ddb6ff87904f01d2"
> PV = "0.1.8+git${SRCPV}"
>
> SRC_URI = "git://git.yoctoproject.org/opkg-utils"
> @@ -21,6 +23,9 @@ do_install() {
> # Avoid circular dependencies from package_ipk.bbclass
> PACKAGES_class-native = ""
>
> +PACKAGES =+ "update-alternatives-opkg"
> +FILES_update-alternatives-opkg = "${bindir}/update-alternatives"
> +
> RDEPENDS_${PN} = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold"
> RDEPENDS_${PN}_class-native = ""
>
> --
> 1.8.5.2
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] default-providers: Change update-alternatives provider to opkg-utils
2014-01-15 2:17 [PATCH 0/3] Change update-alternatives provider Paul Barker
2014-01-15 2:17 ` [PATCH 1/3] opkg-utils: Upgrade to latest git HEAD Paul Barker
@ 2014-01-15 2:17 ` Paul Barker
2014-01-15 2:17 ` [PATCH 3/3] opkg: No longer PROVIDES update-alternatives Paul Barker
2014-01-15 11:21 ` [PATCH 0/3] Change update-alternatives provider Otavio Salvador
3 siblings, 0 replies; 12+ messages in thread
From: Paul Barker @ 2014-01-15 2:17 UTC (permalink / raw)
To: openembedded-core
This allows dependencies to be added to the opkg recipe without causing circular
dependency loops. As opkg-utils has minimal dependencies it is the best recipe
to provide update-alternatives.
This partially solves Yocto Project issue 4836. More work is still needed for a
complete solution.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
meta/conf/distro/include/default-providers.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index e2b0892..419ffcd 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -10,15 +10,15 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
-PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"
-PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
#
# Default virtual runtime providers
#
-VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
+VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg"
VIRTUAL-RUNTIME_apm ?= "apm"
VIRTUAL-RUNTIME_alsa-state ?= "alsa-state"
--
1.8.5.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/3] opkg: No longer PROVIDES update-alternatives
2014-01-15 2:17 [PATCH 0/3] Change update-alternatives provider Paul Barker
2014-01-15 2:17 ` [PATCH 1/3] opkg-utils: Upgrade to latest git HEAD Paul Barker
2014-01-15 2:17 ` [PATCH 2/3] default-providers: Change update-alternatives provider to opkg-utils Paul Barker
@ 2014-01-15 2:17 ` Paul Barker
2014-01-15 15:12 ` Saul Wold
2014-01-15 11:21 ` [PATCH 0/3] Change update-alternatives provider Otavio Salvador
3 siblings, 1 reply; 12+ messages in thread
From: Paul Barker @ 2014-01-15 2:17 UTC (permalink / raw)
To: openembedded-core
The new provider is the opkg-utils recipe.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
meta/recipes-devtools/opkg/opkg.inc | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index c9fb505..527fe5d 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -39,17 +39,13 @@ EXTRA_OECONF = "\
--with-opkglibdir=${OPKGLIBDIR} \
"
-PROVIDES += "virtual/update-alternatives"
-RPROVIDES_update-alternatives-cworth += "update-alternatives"
-RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN}_class-nativesdk = ""
RREPLACES_${PN} = "opkg-nogpg"
-PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth"
+PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg"
-FILES_update-alternatives-cworth = "${bindir}/update-alternatives"
FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so ${includedir}/libopkg"
FILES_libopkg-staticdev = "${libdir}/*.a"
FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
@@ -74,10 +70,8 @@ do_install_append() {
ln -sf opkg-cl ${D}${bindir}/opkg
}
-do_install_append_class-native() {
- if [ "${PREFERRED_PROVIDER_virtual/update-alternatives-native}" != "${PN}" ]; then
- rm ${D}${bindir}/update-alternatives
- fi
+do_install_append() {
+ rm ${D}${bindir}/update-alternatives
}
pkg_postinst_${PN} () {
--
1.8.5.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 3/3] opkg: No longer PROVIDES update-alternatives
2014-01-15 2:17 ` [PATCH 3/3] opkg: No longer PROVIDES update-alternatives Paul Barker
@ 2014-01-15 15:12 ` Saul Wold
2014-01-15 16:13 ` Paul Barker
0 siblings, 1 reply; 12+ messages in thread
From: Saul Wold @ 2014-01-15 15:12 UTC (permalink / raw)
To: Paul Barker, openembedded-core
On 01/14/2014 06:17 PM, Paul Barker wrote:
> The new provider is the opkg-utils recipe.
>
This seems to have triggered a failure on the AB:
| Computing transaction...error: Can't install
nativesdk-shadow-4.1.4.3-r13@i686_nativesdk: no package provides
nativesdk-update-alternatives-opkg
Sau!
> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> ---
> meta/recipes-devtools/opkg/opkg.inc | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
> index c9fb505..527fe5d 100644
> --- a/meta/recipes-devtools/opkg/opkg.inc
> +++ b/meta/recipes-devtools/opkg/opkg.inc
> @@ -39,17 +39,13 @@ EXTRA_OECONF = "\
> --with-opkglibdir=${OPKGLIBDIR} \
> "
>
> -PROVIDES += "virtual/update-alternatives"
> -RPROVIDES_update-alternatives-cworth += "update-alternatives"
> -RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
> RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
> RDEPENDS_${PN}_class-native = ""
> RDEPENDS_${PN}_class-nativesdk = ""
> RREPLACES_${PN} = "opkg-nogpg"
>
> -PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth"
> +PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg"
>
> -FILES_update-alternatives-cworth = "${bindir}/update-alternatives"
> FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so ${includedir}/libopkg"
> FILES_libopkg-staticdev = "${libdir}/*.a"
> FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
> @@ -74,10 +70,8 @@ do_install_append() {
> ln -sf opkg-cl ${D}${bindir}/opkg
> }
>
> -do_install_append_class-native() {
> - if [ "${PREFERRED_PROVIDER_virtual/update-alternatives-native}" != "${PN}" ]; then
> - rm ${D}${bindir}/update-alternatives
> - fi
> +do_install_append() {
> + rm ${D}${bindir}/update-alternatives
> }
>
> pkg_postinst_${PN} () {
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 3/3] opkg: No longer PROVIDES update-alternatives
2014-01-15 15:12 ` Saul Wold
@ 2014-01-15 16:13 ` Paul Barker
2014-01-15 17:05 ` Otavio Salvador
2014-01-15 22:37 ` Saul Wold
0 siblings, 2 replies; 12+ messages in thread
From: Paul Barker @ 2014-01-15 16:13 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
On 15 January 2014 15:12, Saul Wold <sgw@linux.intel.com> wrote:
> On 01/14/2014 06:17 PM, Paul Barker wrote:
>>
>> The new provider is the opkg-utils recipe.
>>
> This seems to have triggered a failure on the AB:
>
> | Computing transaction...error: Can't install
> nativesdk-shadow-4.1.4.3-r13@i686_nativesdk: no package provides
> nativesdk-update-alternatives-opkg
>
I've not really done much with nativesdk, but my guess is I just need to change
BBCLASSEXTEND = "native"
to
BBCLASSEXTEND = "native nativesdk"
in the opkg-utils recipe so that nativesdk-* packages are built for
that recipe. Does that sound correct? If so, I'll re-spin the patches
with that change.
--
Paul Barker
Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 3/3] opkg: No longer PROVIDES update-alternatives
2014-01-15 16:13 ` Paul Barker
@ 2014-01-15 17:05 ` Otavio Salvador
2014-01-15 22:37 ` Saul Wold
1 sibling, 0 replies; 12+ messages in thread
From: Otavio Salvador @ 2014-01-15 17:05 UTC (permalink / raw)
To: Paul Barker; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1055 bytes --]
On Wed, Jan 15, 2014 at 2:13 PM, Paul Barker <paul@paulbarker.me.uk> wrote:
> On 15 January 2014 15:12, Saul Wold <sgw@linux.intel.com> wrote:
> > On 01/14/2014 06:17 PM, Paul Barker wrote:
> >>
> >> The new provider is the opkg-utils recipe.
> >>
> > This seems to have triggered a failure on the AB:
> >
> > | Computing transaction...error: Can't install
> > nativesdk-shadow-4.1.4.3-r13@i686_nativesdk: no package provides
> > nativesdk-update-alternatives-opkg
> >
>
> I've not really done much with nativesdk, but my guess is I just need to
> change
>
> BBCLASSEXTEND = "native"
>
> to
>
> BBCLASSEXTEND = "native nativesdk"
>
> in the opkg-utils recipe so that nativesdk-* packages are built for
> that recipe. Does that sound correct? If so, I'll re-spin the patches
> with that change.
>
Yes; that should fix it.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
[-- Attachment #2: Type: text/html, Size: 1707 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/3] opkg: No longer PROVIDES update-alternatives
2014-01-15 16:13 ` Paul Barker
2014-01-15 17:05 ` Otavio Salvador
@ 2014-01-15 22:37 ` Saul Wold
2014-01-16 13:30 ` Paul Barker
1 sibling, 1 reply; 12+ messages in thread
From: Saul Wold @ 2014-01-15 22:37 UTC (permalink / raw)
To: Paul Barker; +Cc: openembedded-core
On 01/15/2014 08:13 AM, Paul Barker wrote:
> On 15 January 2014 15:12, Saul Wold <sgw@linux.intel.com> wrote:
>> On 01/14/2014 06:17 PM, Paul Barker wrote:
>>>
>>> The new provider is the opkg-utils recipe.
>>>
>> This seems to have triggered a failure on the AB:
>>
>> | Computing transaction...error: Can't install
>> nativesdk-shadow-4.1.4.3-r13@i686_nativesdk: no package provides
>> nativesdk-update-alternatives-opkg
>>
>
> I've not really done much with nativesdk, but my guess is I just need to change
>
> BBCLASSEXTEND = "native"
>
> to
>
> BBCLASSEXTEND = "native nativesdk"
>
> in the opkg-utils recipe so that nativesdk-* packages are built for
> that recipe. Does that sound correct? If so, I'll re-spin the patches
> with that change.
>
Yup, that's it, aslo why did you locate opkg-utils in a separate
directory from opkgs itself? Is there a reason they can't co-locate?
Sau!
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/3] opkg: No longer PROVIDES update-alternatives
2014-01-15 22:37 ` Saul Wold
@ 2014-01-16 13:30 ` Paul Barker
0 siblings, 0 replies; 12+ messages in thread
From: Paul Barker @ 2014-01-16 13:30 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
On 15 January 2014 22:37, Saul Wold <sgw@linux.intel.com> wrote:
> On 01/15/2014 08:13 AM, Paul Barker wrote:
>>
>> On 15 January 2014 15:12, Saul Wold <sgw@linux.intel.com> wrote:
>>>
>>> On 01/14/2014 06:17 PM, Paul Barker wrote:
>>>>
>>>>
>>>> The new provider is the opkg-utils recipe.
>>>>
>>> This seems to have triggered a failure on the AB:
>>>
>>> | Computing transaction...error: Can't install
>>> nativesdk-shadow-4.1.4.3-r13@i686_nativesdk: no package provides
>>> nativesdk-update-alternatives-opkg
>>>
>>
>> I've not really done much with nativesdk, but my guess is I just need to
>> change
>>
>> BBCLASSEXTEND = "native"
>>
>> to
>>
>> BBCLASSEXTEND = "native nativesdk"
>>
>> in the opkg-utils recipe so that nativesdk-* packages are built for
>> that recipe. Does that sound correct? If so, I'll re-spin the patches
>> with that change.
>>
> Yup, that's it, aslo why did you locate opkg-utils in a separate directory
> from opkgs itself? Is there a reason they can't co-locate?
>
I've just modified the existing recipes, I haven't moved anything.
They can probably be merged into one directory if that's beneficial.
Cheers,
--
Paul Barker
Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/3] Change update-alternatives provider
2014-01-15 2:17 [PATCH 0/3] Change update-alternatives provider Paul Barker
` (2 preceding siblings ...)
2014-01-15 2:17 ` [PATCH 3/3] opkg: No longer PROVIDES update-alternatives Paul Barker
@ 2014-01-15 11:21 ` Otavio Salvador
3 siblings, 0 replies; 12+ messages in thread
From: Otavio Salvador @ 2014-01-15 11:21 UTC (permalink / raw)
To: Paul Barker; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 882 bytes --]
On Wed, Jan 15, 2014 at 12:17 AM, Paul Barker <paul@paulbarker.me.uk> wrote:
> The update-alternatives script has been copied from opkg to opkg-utils so
> the
> openembedded recipe for opkg-utils is updated accordingly. Changing the
> default
> provider of update-alternatives to opkg-utils allows dependencies to be
> added to
> the opkg recipe without causing circular dependency loops. This series
> partially
> solves Yocto Project issue 4836.
>
> Tested on Raspberry Pi hardware both with and without "gpg" added to
> PACKAGECONFIG for opkg.
>
Nice; I didn't test the patchset but I couldn't spot any mistake.
I will try to put it in my builder for testing...
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
[-- Attachment #2: Type: text/html, Size: 1480 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread