From f7c591df37493e8f3cde9c19bb0d1edc370eca1c Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Fri, 19 Dec 2014 17:35:29 +0000 Subject: 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 | 28 ++++++++++++++++++++++ .../opkg/opkg-collateral/opkg.conf.comments | 26 -------------------- meta/recipes-devtools/opkg/opkg-collateral/src | 0 5 files changed, 29 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-devtools/opkg/opkg-collateral/dest create mode 100644 meta/recipes-devtools/opkg/opkg-collateral/opkg.conf delete mode 100644 meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments 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 0cf6b8be40..f080dfc3ab 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 088ca403da..0000000000 --- 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 b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf new file mode 100644 index 0000000000..c2e9e92f95 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf @@ -0,0 +1,28 @@ +# Must have one or more source entries of the form: +# +# src +# +# and one or more destination entries of the form: +# +# dest +# +# where and are identifiers that +# should match [a-zA-Z0-9._-]+, should be a +# URL that points to a directory containing a Familiar +# Packages file, and should be a directory +# that exists on the target system. + +# Proxy Support +#option http_proxy http://proxy.tld:3128 +#option ftp_proxy http://proxy.tld:3128 +#option proxy_username +#option proxy_password + +# Enable GPGME signature +# option check_signature 1 + +# 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/opkg.conf.comments b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments deleted file mode 100644 index e1fdada9b5..0000000000 --- a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments +++ /dev/null @@ -1,26 +0,0 @@ -# Must have one or more source entries of the form: -# -# src -# -# and one or more destination entries of the form: -# -# dest -# -# where and are identifiers that -# should match [a-zA-Z0-9._-]+, should be a -# URL that points to a directory containing a Familiar -# Packages file, and should be a directory -# that exists on the target system. - -# Proxy Support -#option http_proxy http://proxy.tld:3128 -#option ftp_proxy http://proxy.tld:3128 -#option proxy_username -#option proxy_password - -# Enable GPGME signature -# option check_signature 1 - -# Offline mode (for use in constructing flash images offline) -#option offline_root target - diff --git a/meta/recipes-devtools/opkg/opkg-collateral/src b/meta/recipes-devtools/opkg/opkg-collateral/src deleted file mode 100644 index e69de29bb2..0000000000 -- cgit 1.2.3-korg