[OE-core] [PATCH] opkg-collateral: import fixes from OE-Classic

[Saul Wold]

On 04/26/2012 03:19 PM, Andreas Oberritter wrote:
> * Set lists_dir to /var/lib/opkg
>
>    commit 16808bc4817492beba512f4e73bce8c232d1eafa
>    Author: Marcin Juszkiewicz<hrw at openembedded.org>
>    Date:   Mon Mar 17 23:40:48 2008 +0000
>
> * Update new options sample and move the opkg.conf to correct place
>
>    commit cc9825d97962287df75e164aec456901292e1b7f
>    Author: Tick Chen<ticktock35 at gmail.com>
>    Date:   Mon Dec 29 19:41:47 2008 +0800
>
> Signed-off-by: Andreas Oberritter<obi at opendreambox.org>
> ---
>   meta/recipes-devtools/opkg/opkg-collateral.bb      |    8 +++++---
>   meta/recipes-devtools/opkg/opkg-collateral/lists   |    2 +-
>   .../opkg/opkg-collateral/opkg.conf.comments        |    3 +++
>   3 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-devtools/opkg/opkg-collateral.bb b/meta/recipes-devtools/opkg/opkg-collateral.bb
> index e3e0b5f..251c535 100644
> --- a/meta/recipes-devtools/opkg/opkg-collateral.bb
> +++ b/meta/recipes-devtools/opkg/opkg-collateral.bb
> @@ -2,6 +2,8 @@ DESCRIPTION = "opkg configuration files"
>   SECTION = "base"
>   LICENSE = "MIT"
>   LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> +PR = "r1"
> +
>   SRC_URI = "file://opkg.conf.comments \
>   	   file://lists \
>   	   file://dest \
> @@ -15,8 +17,8 @@ do_compile () {
>   }
>
>   do_install () {
> -	install -d ${D}${sysconfdir}/
> -	install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg.conf
> +	install -d ${D}${sysconfdir}/opkg
> +	install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
>   }
>
> -CONFFILES_${PN} = "${sysconfdir}/opkg.conf"
> +CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf"
> diff --git a/meta/recipes-devtools/opkg/opkg-collateral/lists b/meta/recipes-devtools/opkg/opkg-collateral/lists
> index 3c524f8..f8aecd8 100644
> --- a/meta/recipes-devtools/opkg/opkg-collateral/lists
> +++ b/meta/recipes-devtools/opkg/opkg-collateral/lists
> @@ -1,2 +1,2 @@
> -lists_dir ext /var/lib/ipkg
> +lists_dir ext /var/lib/opkg
>
> diff --git a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments
> index 51623f4..e1fdada 100644
> --- a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments
> +++ b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments
> @@ -18,6 +18,9 @@
>   #option proxy_username<username>
>   #option proxy_password<password>
>
> +# Enable GPGME signature
> +# option check_signature 1
> +
>   # Offline mode (for use in constructing flash images offline)
>   #option offline_root target
>

Merged into OE-Core

Thanks
	Sau!