diff options
| author |   Graham Gower <graham.gower@gmail.com> | 2010-11-25 10:59:26 +1030 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2010-11-24 22:42:18 -0800 |
| commit | a1bba89847bac62d1cbfe28e3b8059f0fcafa7d1 (patch) | |
| tree | 05b99b360de3326951d475fa95fd64a2dcc507b0 /recipes/opkg | |
| parent | b86e4f9c8757cf2379836a3b500480771693ee20 (diff) | |
| download | openembedded-a1bba89847bac62d1cbfe28e3b8059f0fcafa7d1.tar.gz | |
Remove use of ipkg{,-collateral,-link}.
No one should be using these any longer.
* Opkg conflicts with ipkg.
* There is opkg, opkg-collateral and ipkg-utils contains ipkg-link.
Signed-off-by: Graham Gower <graham.gower@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/opkg')
| -rw-r--r-- | recipes/opkg/opkg-ipkg-compat.bb | 19 | ||||
| -rw-r--r-- | recipes/opkg/opkg.inc | 3 |
2 files changed, 2 insertions, 20 deletions
diff --git a/recipes/opkg/opkg-ipkg-compat.bb b/recipes/opkg/opkg-ipkg-compat.bb deleted file mode 100644 index 837b02c11b..0000000000 --- a/recipes/opkg/opkg-ipkg-compat.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Files to make opkg and ipkg coexist" -RDEPENDS_${PN} = "opkg ipkg ipkg-collateral" - -PR = "r1" -PACKAGE_ARCH = "all" - -do_compile() { - : -} - - -do_install () { - install -d ${D}${sysconfdir} - install -d ${D}/var/lib/ipkg - ln -sf ${sysconfdir}/ipkg.conf ${D}${sysconfdir}/opkg.conf - ln -sf ${sysconfdir}/ipkg/ ${D}${sysconfdir}/opkg - ln -sf /var/lib/ipkg ${D}/var/lib/ipkg -} - diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index ae1622a6fa..0d846269c2 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -4,7 +4,8 @@ SECTION = "base" LICENSE = "GPLv2" SRCREV = ${OPKG_SRCREV} PV = "0.1.8+svnr${SRCPV}" -INC_PR = "r2" +CONFLICTS = "ipkg" +INC_PR = "r3" SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ file://configure \ |