summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-20 11:05:16 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-24 11:54:20 +0000
commit930424bf2f5593256dcacac6e7cf98699fc2a0db (patch)
tree143397dca6c2a486335c5f1c24f0eb6821c873ef /meta/recipes-devtools
parentc6c3f8745090c00eb02614a003925c533660e813 (diff)
downloadpoky-930424bf2f5593256dcacac6e7cf98699fc2a0db.tar.gz
opkg: move common code & metadata into opkg.inc to reduce code duplication
(From OE-Core rev: da70cc9f33845d62943afc78168e56931d0a9b15) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc43
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.1.8.bb44
-rw-r--r--meta/recipes-devtools/opkg/opkg_svn.bb42
3 files changed, 44 insertions, 85 deletions
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 3e350e8197..b03eaf7643 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -11,6 +11,7 @@ DEPENDS_virtclass-native = "curl-native"
11DEPENDS_virtclass-nativesdk = "curl-nativesdk" 11DEPENDS_virtclass-nativesdk = "curl-nativesdk"
12 12
13PE = "1" 13PE = "1"
14PR_INC = "r6"
14 15
15FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg" 16FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg"
16 17
@@ -31,8 +32,46 @@ EXTRA_OECONF += "--with-opkglibdir=${localstatedir}/lib"
31EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl" 32EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
32EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl" 33EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
33 34
34#PROVIDES_append_virtclass-native = "virtual/update-alternatives-native" 35PROVIDES += "virtual/update-alternatives"
35#RPROVIDES_${PN} += "update-alternatives-native" 36RPROVIDES_update-alternatives-cworth += "update-alternatives"
37RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
38RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
39RDEPENDS_${PN}_virtclass-native = ""
40RDEPENDS_${PN}_virtclass-nativesdk = ""
41PACKAGE_ARCH_update-alternatives-cworth = "all"
42RREPLACES_${PN} = "opkg-nogpg"
43
44PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
45
46FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives"
47FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
48FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
49
50# We need to create the lock directory
51do_install_append() {
52 install -d ${D}${localstatedir}/lib/opkg
53}
54
55pkg_postinst_${PN} () {
56#!/bin/sh
57if [ "x$D" != "x" ]; then
58 install -d $D${sysconfdir}/rcS.d
59 # this happens at S98 where our good 'ole packages script used to run
60 echo "#!/bin/sh
61opkg-cl configure
62rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
63" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
64 chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
65fi
66
67update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
68}
69
70pkg_postrm_${PN} () {
71#!/bin/sh
72update-alternatives --remove opkg ${bindir}/opkg-cl
73}
74
36 75
37BBCLASSEXTEND = "native nativesdk" 76BBCLASSEXTEND = "native nativesdk"
38 77
diff --git a/meta/recipes-devtools/opkg/opkg_0.1.8.bb b/meta/recipes-devtools/opkg/opkg_0.1.8.bb
index 18cf0428ce..c206b3782f 100644
--- a/meta/recipes-devtools/opkg/opkg_0.1.8.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.1.8.bb
@@ -1,48 +1,8 @@
1require opkg.inc 1require opkg.inc
2 2
3PROVIDES += "virtual/update-alternatives"
4RPROVIDES_update-alternatives-cworth += "update-alternatives"
5RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
6RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
7RDEPENDS_${PN}_virtclass-native = ""
8RDEPENDS_${PN}_virtclass-nativesdk = ""
9PACKAGE_ARCH_update-alternatives-cworth = "all"
10
11SRC_URI = "http://opkg.googlecode.com/files/opkg-${PV}.tar.gz \ 3SRC_URI = "http://opkg.googlecode.com/files/opkg-${PV}.tar.gz \
12 file://add_vercmp.patch \ 4 file://add_vercmp.patch \
13 file://headerfix.patch \ 5 file://headerfix.patch \
14" 6 "
15
16PR = "r4"
17
18PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
19
20FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives"
21FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
22FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
23
24# We need to create the lock directory
25do_install_append() {
26 install -d ${D}${localstatedir}/lib/opkg
27}
28
29pkg_postinst_${PN} () {
30#!/bin/sh
31if [ "x$D" != "x" ]; then
32 install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
33 # this happens at S98 where our good 'ole packages script used to run
34 echo "#!/bin/sh
35opkg-cl configure
36rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
37" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
38 chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
39fi
40
41update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
42}
43
44pkg_postrm_${PN} () {
45#!/bin/sh
46update-alternatives --remove opkg ${bindir}/opkg-cl
47}
48 7
8PR = "${INC_PR}.0"
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index f5f540d78e..c07d393019 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -1,14 +1,5 @@
1require opkg.inc 1require opkg.inc
2 2
3PROVIDES += "virtual/update-alternatives"
4RPROVIDES_update-alternatives-cworth += "update-alternatives"
5RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
6RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
7RDEPENDS_${PN}_virtclass-native = ""
8RDEPENDS_${PN}_virtclass-nativesdk = ""
9PACKAGE_ARCH_update-alternatives-cworth = "all"
10RREPLACES_${PN} = "opkg-nogpg"
11
12SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ 3SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
13 file://add_vercmp.patch \ 4 file://add_vercmp.patch \
14 file://add_uname_support.patch \ 5 file://add_uname_support.patch \
@@ -21,36 +12,5 @@ S = "${WORKDIR}/trunk"
21 12
22SRCREV = "633" 13SRCREV = "633"
23PV = "0.1.8+svnr${SRCPV}" 14PV = "0.1.8+svnr${SRCPV}"
24PR = "r5"
25
26PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
27
28FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives"
29FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
30FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
31
32# We need to create the lock directory
33do_install_append() {
34 install -d ${D}${localstatedir}/lib/opkg
35}
36
37pkg_postinst_${PN} () {
38#!/bin/sh
39if [ "x$D" != "x" ]; then
40 install -d $D${sysconfdir}/rcS.d
41 # this happens at S98 where our good 'ole packages script used to run
42 echo "#!/bin/sh
43opkg-cl configure
44rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
45" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
46 chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
47fi
48
49update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
50}
51
52pkg_postrm_${PN} () {
53#!/bin/sh
54update-alternatives --remove opkg ${bindir}/opkg-cl
55}
56 15
16PR = "${INC_PR}.0"