Patchwork [3/3] opkg: No longer PROVIDES update-alternatives

login
register
mail settings
Submitter Paul Barker
Date Jan. 15, 2014, 2:17 a.m.
Message ID <1389752246-4296-4-git-send-email-paul@paulbarker.me.uk>
Download mbox | patch
Permalink /patch/64771/
State New
Headers show

Comments

Paul Barker - Jan. 15, 2014, 2:17 a.m.
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(-)
Saul Wold - Jan. 15, 2014, 3:12 p.m.
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} () {
>
Paul Barker - Jan. 15, 2014, 4:13 p.m.
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.
Otavio Salvador - Jan. 15, 2014, 5:05 p.m.
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.
Saul Wold - Jan. 15, 2014, 10:37 p.m.
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!
Paul Barker - Jan. 16, 2014, 1:30 p.m.
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,

Patch

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} () {