From f8ba2758c535841de5c76ff06150a76219796886 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 16 Mar 2011 10:30:11 -0500 Subject: rpm: Disable repackage on upgrade/erasure by default [YOCTO #787] Disable the repackage on upgrade/erase by default. This removes the warning message: error: cannot create %_repackage_dir /var/spool/repackage/1298783317 (From OE-Core rev: 3878ef5deacda480b7c689720733c03ef6b3c702) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/rpm/rpm_5.4.0.bb') diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index 370481647a..dd51c9c3b3 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb @@ -43,7 +43,7 @@ LICENSE = "LGPL 2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "bzip2 zlib python perl db openssl elfutils expat libpcre attr acl popt" -PR = "r14" +PR = "r15" # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # in order to extract the distribution SRPM into a format we can extract... @@ -343,6 +343,7 @@ do_install_append() { sed -i -e 's,%__scriptlet_requires,#%%__scriptlet_requires,' ${D}/${libdir}/rpm/macros sed -i -e 's,%__perl_provides,#%%__perl_provides,' ${D}/${libdir}/rpm/macros sed -i -e 's,%__perl_requires,#%%__perl_requires,' ${D}/${libdir}/rpm/macros + sed -i -e 's,%_repackage_all_erasures[^_].*,%_repackage_all_erasures 0,' ${D}/${libdir}/rpm/macros # Enable Debian style arbitrary tags... sed -i -e 's,%_arbitrary_tags[^_].*,%_arbitrary_tags %{_arbitrary_tags_debian},' ${D}/${libdir}/rpm/macros -- cgit v1.2.3-54-g00ecf