diff options
author | Ross Burton <ross.burton@intel.com> | 2015-10-19 22:47:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-27 07:24:30 +0000 |
commit | 19358d0cb50a6e5c626b3abc5b6c2036c2748075 (patch) | |
tree | 2df64052ec613d8f4fc743f4cd3314726479ab6e | |
parent | 698c3deebe21906d8c8470a735fcb72d543b0ccf (diff) | |
download | poky-19358d0cb50a6e5c626b3abc5b6c2036c2748075.tar.gz |
rpm: add explicit dependency on file-replacement-native for native builds
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_4.11.2.bb | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_4.11.2.bb b/meta/recipes-devtools/rpm/rpm_4.11.2.bb index bc36f99e63..f4a2110ae0 100644 --- a/meta/recipes-devtools/rpm/rpm_4.11.2.bb +++ b/meta/recipes-devtools/rpm/rpm_4.11.2.bb | |||
@@ -23,6 +23,7 @@ LICENSE = "GPL-2.0+" | |||
23 | LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | 23 | LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" |
24 | 24 | ||
25 | DEPENDS = "db libxml2 xz findutils file popt nss bzip2 elfutils attr zlib acl gzip python" | 25 | DEPENDS = "db libxml2 xz findutils file popt nss bzip2 elfutils attr zlib acl gzip python" |
26 | DEPENDS_append_class-native = " file-replacement-native" | ||
26 | 27 | ||
27 | SRC_URI += "http://rpm.org/releases/rpm-4.11.x/${BP}.tar.bz2 \ | 28 | SRC_URI += "http://rpm.org/releases/rpm-4.11.x/${BP}.tar.bz2 \ |
28 | file://use-pkgconfig-for-python.patch \ | 29 | file://use-pkgconfig-for-python.patch \ |
diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb index 8903f3bc35..951b2517f0 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | |||
@@ -43,6 +43,7 @@ LICENSE = "LGPLv2.1" | |||
43 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" | 43 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" |
44 | 44 | ||
45 | DEPENDS = "libpcre attr acl popt ossp-uuid file byacc-native" | 45 | DEPENDS = "libpcre attr acl popt ossp-uuid file byacc-native" |
46 | DEPENDS_append_class-native = " file-replacement-native" | ||
46 | 47 | ||
47 | S = "${WORKDIR}/rpm" | 48 | S = "${WORKDIR}/rpm" |
48 | 49 | ||
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index b450c6fc39..73b3734d58 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb | |||
@@ -41,6 +41,7 @@ LICENSE = "LGPLv2.1" | |||
41 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" | 41 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" |
42 | 42 | ||
43 | DEPENDS = "libpcre attr acl popt ossp-uuid file byacc-native" | 43 | DEPENDS = "libpcre attr acl popt ossp-uuid file byacc-native" |
44 | DEPENDS_append_class-native = " file-replacement-native" | ||
44 | 45 | ||
45 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed | 46 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed |
46 | # in order to extract the distribution SRPM into a format we can extract... | 47 | # in order to extract the distribution SRPM into a format we can extract... |