From: nslu2-linux.adm@bkbits.net Date: Mon, 28 Mar 2005 16:41:34 +0000 (+0000) Subject: Merge bk://oe-devel.bkbits.net/openembedded X-Git-Tag: Release-2010-05/1~14617 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bdbb19b65b41c50f5b49ffcfeeb68862795c164;p=openembedded.git Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/28 17:57:32+02:00 utwente.nl!koen Kill obsolete ipkg patches BKrev: 424833bejH8Nx6mDw5yM5Z6U-WW6vA --- diff --git a/packages/ipkg-utils/files/fix-ipkg-link.patch b/packages/ipkg-utils/files/fix-ipkg-link.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ipkg-utils/files/ipkg-link-oe.patch b/packages/ipkg-utils/files/ipkg-link-oe.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ipkg-utils/ipkg-link_1.6cvs.bb b/packages/ipkg-utils/ipkg-link_1.6cvs.bb index 14d69dc7e9..0560ce8d95 100644 --- a/packages/ipkg-utils/ipkg-link_1.6cvs.bb +++ b/packages/ipkg-utils/ipkg-link_1.6cvs.bb @@ -5,9 +5,7 @@ CONFLICTS = "ipkg-utils" PV_append = "${CVSDATE}" PR = "r1" -SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ - file://fix-ipkg-link.patch;patch=1 \ - file://ipkg-link-oe.patch;patch=1" +SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" S = "${WORKDIR}/ipkg-utils" diff --git a/packages/ipkg-utils/ipkg-utils-1.6cvs/fix-ipkg-link.patch b/packages/ipkg-utils/ipkg-utils-1.6cvs/fix-ipkg-link.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb index 4a1ba11008..87fb11012f 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb @@ -10,9 +10,7 @@ PV_append = "${CVSDATE}" PR = "r8" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ - file://fix-ipkg-link.patch;patch=1 \ - file://fix-ipkg-tar.patch;patch=1 \ - file://ipkg-link-oe.patch;patch=1" + file://fix-ipkg-tar.patch;patch=1" S = "${WORKDIR}/ipkg-utils"