[oe-commits] Robert Yang : rpm: remove invalid sed command
git at git.openembedded.org
git at git.openembedded.org
Sun Jul 12 21:54:29 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 53c8c290e5d25976909a821eead31633b25b9952
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=53c8c290e5d25976909a821eead31633b25b9952
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Fri Jul 10 00:14:51 2015 -0700
rpm: remove invalid sed command
There is no __check_files in rpm/macros any more, so remove the sed
command.
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 1 -
meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 -
2 files changed, 2 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
index a85e28f..8903f3b 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
@@ -411,7 +411,6 @@ do_configure() {
}
do_install_append() {
- sed -i -e 's,%__check_files,#%%__check_files,' ${D}/${libdir}/rpm/macros
sed -i -e 's,%__scriptlet_requires,#%%__scriptlet_requires,' ${D}/${libdir}/rpm/macros
sed -i -e 's,%__perl_provides,#%%__perl_provides,' ${D}/${libdir}/rpm/macros ${D}/${libdir}/rpm/macros.d/*
sed -i -e 's,%__perl_requires,#%%__perl_requires,' ${D}/${libdir}/rpm/macros ${D}/${libdir}/rpm/macros.d/*
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index bff0687..ddbdcb9 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
@@ -396,7 +396,6 @@ do_configure() {
}
do_install_append() {
- sed -i -e 's,%__check_files,#%%__check_files,' ${D}/${libdir}/rpm/macros
sed -i -e 's,%__scriptlet_requires,#%%__scriptlet_requires,' ${D}/${libdir}/rpm/macros
sed -i -e 's,%__perl_provides,#%%__perl_provides,' ${D}/${libdir}/rpm/macros ${D}/${libdir}/rpm/macros.d/*
sed -i -e 's,%__perl_requires,#%%__perl_requires,' ${D}/${libdir}/rpm/macros ${D}/${libdir}/rpm/macros.d/*
More information about the Openembedded-commits
mailing list