Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

3 files changed, 0 insertions, 81 deletions

diff --git a/packages/rpm/files/cross_libpaths.patch b/packages/rpm/files/cross_libpaths.patch
deleted file mode 100644
index d6139dbdde..0000000000
--- a/packages/rpm/files/cross_libpaths.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rpm-4.4/configure.ac
-===================================================================
---- rpm-4.4.orig/configure.ac	2005-01-29 10:54:37.698359056 -0500
-+++ rpm-4.4/configure.ac	2005-01-29 10:55:16.492461456 -0500
-@@ -321,10 +321,8 @@
- 
- localdone=
- 
--dirs=$prefix
- if test "$cross_compiling" != "yes"; then
--  dirs="$dirs /usr/local"
--fi
-+dirs="$prefix /usr/local"
- for dir in $dirs
- do
- 	case $dir in
-@@ -366,6 +364,7 @@
- else
- 	AC_MSG_RESULT(no)
- fi
-+fi
- 
- dnl
- dnl Check for features
diff --git a/packages/rpm/files/fix_mypath.patch b/packages/rpm/files/fix_mypath.patch
deleted file mode 100644
index 09512be131..0000000000
--- a/packages/rpm/files/fix_mypath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rpm-4.4/configure.ac
-===================================================================
---- rpm-4.4.orig/configure.ac	2005-01-29 10:54:13.599022712 -0500
-+++ rpm-4.4/configure.ac	2005-01-29 10:54:37.698359056 -0500
-@@ -230,7 +230,7 @@
- dnl use defaults if cross-compiling, otherwise use the default path.
- dnl
- if test "$cross_compiling" = "yes"; then
--    MYPATH=""
-+    MYPATH=":"
- else
- #    MYPATH="/bin:/usr/bin:/usr/local/bin:$PATH:/sbin:/usr/sbin:/usr/local/sbin:/opt/gnu/bin"
-     MYPATH=$PATH
diff --git a/packages/rpm/rpm_4.4.bb b/packages/rpm/rpm_4.4.bb
deleted file mode 100644
index ff69ddc50f..0000000000
--- a/packages/rpm/rpm_4.4.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "The RPM Package Manager."
-HOMEPAGE = "http://rpm.org/"
-LICENSE = "LGPL GPL"
-# NOTE: currently rpm doesn't support using an external popt,
-# file, or virtual/db.  FIXME: patch it to support that.
-# DEPENDS = "virtual/db popt file zlib"
-DEPENDS = "zlib"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.jbj.org/pub/rpm-4.4.x/rpm-4.4-1.src.rpm \
-	   file://fix_mypath.patch;patch=1 \
-	   file://cross_libpaths.patch;patch=1"
-TARBALL = "${WORKDIR}/rpm-4.4.tar.gz"
-
-inherit autotools gettext
-
-acpaths = ""
-# NOTE: currently BROKEN because its internal build of 'file' tries
-# to run the binary it builds.  Either switch to an external build,
-# or depend on our file-native and make it call that.
-BROKEN = "1"
-EXTRA_OECONF = "--without-python \
-		--without-apidocs \
-		--without-selinux \
-		--without-lua \
-		--without-dmalloc \
-		--without-efence"
-
-python unpack_again () {
-	import bb, os
-	os.chdir(bb.data.getVar('WORKDIR', d, 1) or '')
-	if not oe_unpack_file(bb.data.expand('${TARBALL}', d), d):
-		raise bb.build.FuncFailed(bb.data.expand("Unable to unpack ${TARBALL}", d))
-}
-
-python do_unpack () {
-	bb.build.exec_func('base_do_unpack', d)
-	bb.build.exec_func('unpack_again', d)
-}
-
-do_configure () {
-	touch db3/configure.ac
-	autotools_do_configure
-}