summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/package_ipk.bbclass4
-rw-r--r--meta/classes/rootfs_ipk.bbclass16
-rw-r--r--meta/recipes-devtools/opkg/opkg-collateral.bb6
-rw-r--r--meta/recipes-devtools/opkg/opkg-collateral/lists2
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc25
5 files changed, 28 insertions, 25 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 433d0bbe88..e46a52a022 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -12,6 +12,8 @@ OPKGBUILDCMD ??= "opkg-build"
12 12
13OPKG_ARGS = "-f $INSTALL_CONF_IPK -o $INSTALL_ROOTFS_IPK --force_postinstall --prefer-arch-to-version" 13OPKG_ARGS = "-f $INSTALL_CONF_IPK -o $INSTALL_ROOTFS_IPK --force_postinstall --prefer-arch-to-version"
14 14
15OPKGLIBDIR = "${localstatedir}/lib"
16
15python package_ipk_fn () { 17python package_ipk_fn () {
16 d.setVar('PKGFN', d.getVar('PKG')) 18 d.setVar('PKGFN', d.getVar('PKG'))
17} 19}
@@ -138,7 +140,7 @@ package_install_internal_ipk() {
138 local package_to_install="${INSTALL_PACKAGES_NORMAL_IPK}" 140 local package_to_install="${INSTALL_PACKAGES_NORMAL_IPK}"
139 local package_multilib="${INSTALL_PACKAGES_MULTILIB_IPK}" 141 local package_multilib="${INSTALL_PACKAGES_MULTILIB_IPK}"
140 142
141 mkdir -p ${target_rootfs}${localstatedir}/lib/opkg/ 143 mkdir -p ${target_rootfs}${OPKGLIBDIR}/opkg
142 144
143 local ipkg_args="${OPKG_ARGS}" 145 local ipkg_args="${OPKG_ARGS}"
144 146
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 0e2fa12ac9..b73ff4bbce 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -19,11 +19,11 @@ OPKG_PREPROCESS_COMMANDS = "package_update_index_ipk; package_generate_ipkg_conf
19 19
20OPKG_POSTPROCESS_COMMANDS = "ipk_insert_feed_uris; " 20OPKG_POSTPROCESS_COMMANDS = "ipk_insert_feed_uris; "
21 21
22opkglibdir = "${localstatedir}/lib/opkg" 22OPKGLIBDIR = "${localstatedir}/lib"
23 23
24# Which packages to not install on the basis of a recommendation 24# Which packages to not install on the basis of a recommendation
25BAD_RECOMMENDATIONS ?= "" 25BAD_RECOMMENDATIONS ?= ""
26MULTILIBRE_ALLOW_REP = "${opkglibdir}" 26MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg"
27 27
28fakeroot rootfs_ipk_do_rootfs () { 28fakeroot rootfs_ipk_do_rootfs () {
29 set -x 29 set -x
@@ -37,8 +37,8 @@ fakeroot rootfs_ipk_do_rootfs () {
37 37
38 export INSTALL_CONF_IPK="${IPKGCONF_TARGET}" 38 export INSTALL_CONF_IPK="${IPKGCONF_TARGET}"
39 export INSTALL_ROOTFS_IPK="${IMAGE_ROOTFS}" 39 export INSTALL_ROOTFS_IPK="${IMAGE_ROOTFS}"
40 STATUS=${IMAGE_ROOTFS}${opkglibdir}/status 40 STATUS=${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg/status
41 mkdir -p ${IMAGE_ROOTFS}${opkglibdir} 41 mkdir -p ${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg
42 42
43 opkg-cl ${OPKG_ARGS} update 43 opkg-cl ${OPKG_ARGS} update
44 44
@@ -93,7 +93,7 @@ fakeroot rootfs_ipk_do_rootfs () {
93 93
94 ${ROOTFS_POSTPROCESS_COMMAND} 94 ${ROOTFS_POSTPROCESS_COMMAND}
95 95
96 rm -f ${IMAGE_ROOTFS}${opkglibdir}/lists/* 96 rm -f ${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg/lists/*
97 if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then 97 if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then
98 if ! grep Status:.install.ok.unpacked ${STATUS}; then 98 if ! grep Status:.install.ok.unpacked ${STATUS}; then
99 # All packages were successfully configured. 99 # All packages were successfully configured.
@@ -120,7 +120,7 @@ fakeroot rootfs_ipk_do_rootfs () {
120 120
121rootfs_ipk_write_manifest() { 121rootfs_ipk_write_manifest() {
122 manifest=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest 122 manifest=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest
123 cp ${IMAGE_ROOTFS}${opkglibdir}/status $manifest 123 cp ${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg/status $manifest
124 124
125 sed '/Depends/d' -i $manifest 125 sed '/Depends/d' -i $manifest
126 sed '/Status/d' -i $manifest 126 sed '/Status/d' -i $manifest
@@ -133,9 +133,9 @@ rootfs_ipk_write_manifest() {
133} 133}
134 134
135remove_packaging_data_files() { 135remove_packaging_data_files() {
136 rm -rf ${IMAGE_ROOTFS}${opkglibdir} 136 rm -rf ${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg
137 # We need the directory for the package manager lock 137 # We need the directory for the package manager lock
138 mkdir ${IMAGE_ROOTFS}${opkglibdir} 138 mkdir ${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg
139} 139}
140 140
141list_installed_packages() { 141list_installed_packages() {
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"
2SECTION = "base" 2SECTION = "base"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 4LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5PR = "r1" 5PR = "r2"
6 6
7SRC_URI = "file://opkg.conf.comments \ 7SRC_URI = "file://opkg.conf.comments \
8 file://lists \
9 file://dest \ 8 file://dest \
10 file://src " 9 file://src "
11 10
11OPKGLIBDIR = "${localstatedir}/lib"
12do_compile () { 12do_compile () {
13 cat ${WORKDIR}/opkg.conf.comments >${WORKDIR}/opkg.conf 13 cat ${WORKDIR}/opkg.conf.comments >${WORKDIR}/opkg.conf
14 cat ${WORKDIR}/src >>${WORKDIR}/opkg.conf 14 cat ${WORKDIR}/src >>${WORKDIR}/opkg.conf
15 cat ${WORKDIR}/dest >>${WORKDIR}/opkg.conf 15 cat ${WORKDIR}/dest >>${WORKDIR}/opkg.conf
16 cat ${WORKDIR}/lists >>${WORKDIR}/opkg.conf 16 echo "lists_dir ext ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf
17} 17}
18 18
19do_install () { 19do_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 @@
1lists_dir ext /var/lib/opkg
2
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 \
9 file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba" 9 file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba"
10 10
11PE = "1" 11PE = "1"
12INC_PR = "r12" 12INC_PR = "r13"
13 13
14# Werror gives all kinds bounds issuses with gcc 4.3.3 14# Werror gives all kinds bounds issuses with gcc 4.3.3
15do_configure_prepend() { 15do_configure_prepend() {
@@ -17,16 +17,19 @@ do_configure_prepend() {
17} 17}
18 18
19inherit autotools pkgconfig 19inherit autotools pkgconfig
20EXTRA_OECONF += " --disable-gpg \
21 --disable-openssl \
22 --disable-ssl-curl \
23 --disable-curl \
24 --disable-sha256"
25 20
26target_localstatedir := "${localstatedir}" 21target_localstatedir := "${localstatedir}"
27EXTRA_OECONF += "--with-opkglibdir=${localstatedir}/lib" 22OPKGLIBDIR = "${target_localstatedir}/lib"
28EXTRA_OECONF_class-native = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl" 23
29EXTRA_OECONF_class-nativesdk = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl" 24SHARED_EXTRA_OECONF = "\
25 --with-opkglibdir=${OPKGLIBDIR} \
26 --disable-gpg \
27 --disable-curl \
28 --disable-openssl \
29"
30EXTRA_OECONF_class-target = "${SHARED_EXTRA_OECONF} --disable-ssl-curl --disable-sha256"
31EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF}"
32EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF}"
30 33
31PROVIDES += "virtual/update-alternatives" 34PROVIDES += "virtual/update-alternatives"
32RPROVIDES_update-alternatives-cworth += "update-alternatives" 35RPROVIDES_update-alternatives-cworth += "update-alternatives"
@@ -41,11 +44,11 @@ PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth"
41FILES_update-alternatives-cworth = "${bindir}/update-alternatives" 44FILES_update-alternatives-cworth = "${bindir}/update-alternatives"
42FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so" 45FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so"
43FILES_libopkg-staticdev = "${libdir}/*.a" 46FILES_libopkg-staticdev = "${libdir}/*.a"
44FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" 47FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
45 48
46do_install_append() { 49do_install_append() {
47 # We need to create the lock directory 50 # We need to create the lock directory
48 install -d ${D}${localstatedir}/lib/opkg 51 install -d ${D}${OPKGLIBDIR}/opkg
49} 52}
50 53
51do_install_append_class-native() { 54do_install_append_class-native() {