From 6e332a546cd12d3ef5a721f0eb1d3a59117efc4b Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Fri, 19 Dec 2014 17:35:29 +0000 Subject: [PATCH] opkg-collateral: Simplify source files Instead of having the source files 'opkg.conf.comments', 'dest' and 'src', we simply have one 'opkg.conf' file containing all the necessary configuration. This does mean that replacing 'src' in a bbappend to define distro-specific package feeds is no longer supported, but these feed configurations should be packaged separately from the rest of the opkg configuration anyway so that things can be updated independently. The best recipe to use for managing feed configs is currently distro-feed-config in the meta-oe layer. Signed-off-by: Paul Barker --- meta/recipes-devtools/opkg/opkg-collateral.bb | 7 +------ meta/recipes-devtools/opkg/opkg-collateral/dest | 1 - .../opkg/opkg-collateral/{opkg.conf.comments => opkg.conf} | 2 ++ meta/recipes-devtools/opkg/opkg-collateral/src | 0 4 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 meta/recipes-devtools/opkg/opkg-collateral/dest rename meta/recipes-devtools/opkg/opkg-collateral/{opkg.conf.comments => opkg.conf} (92%) delete mode 100644 meta/recipes-devtools/opkg/opkg-collateral/src diff --git a/meta/recipes-devtools/opkg/opkg-collateral.bb b/meta/recipes-devtools/opkg/opkg-collateral.bb index 0cf6b8be403..f080dfc3ab1 100644 --- a/meta/recipes-devtools/opkg/opkg-collateral.bb +++ b/meta/recipes-devtools/opkg/opkg-collateral.bb @@ -4,17 +4,12 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r2" -SRC_URI = "file://opkg.conf.comments \ - file://dest \ - file://src " +SRC_URI = "file://opkg.conf" S = "${WORKDIR}" OPKGLIBDIR = "${localstatedir}/lib" do_compile () { - cat ${WORKDIR}/opkg.conf.comments >${WORKDIR}/opkg.conf - cat ${WORKDIR}/src >>${WORKDIR}/opkg.conf - cat ${WORKDIR}/dest >>${WORKDIR}/opkg.conf echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf } diff --git a/meta/recipes-devtools/opkg/opkg-collateral/dest b/meta/recipes-devtools/opkg/opkg-collateral/dest deleted file mode 100644 index 088ca403da0..00000000000 --- a/meta/recipes-devtools/opkg/opkg-collateral/dest +++ /dev/null @@ -1 +0,0 @@ -dest root / diff --git a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf similarity index 92% rename from meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments rename to meta/recipes-devtools/opkg/opkg-collateral/opkg.conf index e1fdada9b5e..c2e9e92f95b 100644 --- a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments +++ b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf @@ -24,3 +24,5 @@ # Offline mode (for use in constructing flash images offline) #option offline_root target +# Default destination for installed packages +dest root / diff --git a/meta/recipes-devtools/opkg/opkg-collateral/src b/meta/recipes-devtools/opkg/opkg-collateral/src deleted file mode 100644 index e69de29bb2d..00000000000 -- 2.47.2