diff options
Diffstat (limited to 'meta/recipes-devtools/opkg')
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg-collateral.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg-collateral/lists | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 25 |
3 files changed, 17 insertions, 16 deletions
diff --git a/meta/recipes-devtools/opkg/opkg-collateral.bb b/meta/recipes-devtools/opkg/opkg-collateral.bb index 251c535438..cacd8800e9 100644 --- a/meta/recipes-devtools/opkg/opkg-collateral.bb +++ b/meta/recipes-devtools/opkg/opkg-collateral.bb @@ -2,18 +2,18 @@ DESCRIPTION = "opkg configuration files" SECTION = "base" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r1" +PR = "r2" SRC_URI = "file://opkg.conf.comments \ - file://lists \ file://dest \ file://src " +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 - cat ${WORKDIR}/lists >>${WORKDIR}/opkg.conf + echo "lists_dir ext ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf } do_install () { diff --git a/meta/recipes-devtools/opkg/opkg-collateral/lists b/meta/recipes-devtools/opkg/opkg-collateral/lists deleted file mode 100644 index f8aecd8e15..0000000000 --- a/meta/recipes-devtools/opkg/opkg-collateral/lists +++ /dev/null @@ -1,2 +0,0 @@ -lists_dir ext /var/lib/opkg - diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index 47458ff350..8d48006d64 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba" PE = "1" -INC_PR = "r12" +INC_PR = "r13" # Werror gives all kinds bounds issuses with gcc 4.3.3 do_configure_prepend() { @@ -17,16 +17,19 @@ do_configure_prepend() { } inherit autotools pkgconfig -EXTRA_OECONF += " --disable-gpg \ - --disable-openssl \ - --disable-ssl-curl \ - --disable-curl \ - --disable-sha256" target_localstatedir := "${localstatedir}" -EXTRA_OECONF += "--with-opkglibdir=${localstatedir}/lib" -EXTRA_OECONF_class-native = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl" -EXTRA_OECONF_class-nativesdk = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl" +OPKGLIBDIR = "${target_localstatedir}/lib" + +SHARED_EXTRA_OECONF = "\ + --with-opkglibdir=${OPKGLIBDIR} \ + --disable-gpg \ + --disable-curl \ + --disable-openssl \ +" +EXTRA_OECONF_class-target = "${SHARED_EXTRA_OECONF} --disable-ssl-curl --disable-sha256" +EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF}" +EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF}" PROVIDES += "virtual/update-alternatives" RPROVIDES_update-alternatives-cworth += "update-alternatives" @@ -41,11 +44,11 @@ PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth" FILES_update-alternatives-cworth = "${bindir}/update-alternatives" FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so" FILES_libopkg-staticdev = "${libdir}/*.a" -FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" +FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" do_install_append() { # We need to create the lock directory - install -d ${D}${localstatedir}/lib/opkg + install -d ${D}${OPKGLIBDIR}/opkg } do_install_append_class-native() { |