[OE-core] [PATCH 2/8] opkg-arch-config: Renamed from opkg-config-base

[Martin Jansa]

On Sun, Dec 21, 2014 at 10:11:51PM +0000, Paul Barker wrote:
> The name 'opkg-arch-config' is much more descriptive.
> 
> Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
> ---
>  meta/conf/layer.conf                                                   | 2 +-
>  .../opkg/{opkg-config-base_1.0.bb => opkg-arch-config_1.0.bb}          | 3 ++-
>  meta/recipes-devtools/opkg/opkg.inc                                    | 2 +-
>  3 files changed, 4 insertions(+), 3 deletions(-)
>  rename meta/recipes-devtools/opkg/{opkg-config-base_1.0.bb => opkg-arch-config_1.0.bb} (87%)
> 
> diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
> index de96548..4fd3a16 100644
> --- a/meta/conf/layer.conf
> +++ b/meta/conf/layer.conf
> @@ -18,7 +18,7 @@ COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}'
>  SIGGEN_EXCLUDERECIPES_ABISAFE += " \
>    sysvinit-inittab \
>    shadow-securetty \
> -  opkg-config-base \
> +  opkg-arch-config \
>    netbase \
>    init-ifupdown \
>    connman-conf \
> diff --git a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
> similarity index 87%
> rename from meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
> rename to meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
> index acbe129..f700865 100644
> --- a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
> +++ b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
> @@ -1,4 +1,4 @@
> -SUMMARY = "Base configuration files for opkg"
> +SUMMARY = "Architecture-dependent configuration for opkg"
>  LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
> @@ -28,3 +28,4 @@ FILES_${PN} = "${sysconfdir}/opkg/ "
>  
>  CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf"
>  
> +RREPLACES_${PN} = "opkg-config-base"

Is this enough for opkg to automatically replace opkg-config-base with
opkg-arch-config during opkg upgrade?

With older opkg releases you always had to use whole combo
RPROVIDES+RREPLACES+RCONFLICTS.

> diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
> index 56c54b6..991c114 100644
> --- a/meta/recipes-devtools/opkg/opkg.inc
> +++ b/meta/recipes-devtools/opkg/opkg.inc
> @@ -38,7 +38,7 @@ EXTRA_OECONF = "\
>    --with-opkglibdir=${OPKGLIBDIR} \
>  "
>  
> -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base run-postinsts"
> +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config run-postinsts"
>  RDEPENDS_${PN}_class-native = ""
>  RDEPENDS_${PN}_class-nativesdk = ""
>  RREPLACES_${PN} = "opkg-nogpg"
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20141222/8da8e34a/attachment-0002.sig>