summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2016-04-06 14:18:11 +0200
committerAlexander Larsson <alexl@redhat.com>2016-04-06 14:18:11 +0200
commit6d5c995fe9f4c456228d7ad37f4ca1e3f4921522 (patch)
treefb90dd0d58d7b390cd12de27807560c076d18b22
parentf4f4970a0839f4a855d64d6bef362733781821ec (diff)
sdk: Remove rpm and smartpm
We don't use this to build the other layers anway, so no need to have it anymore.
-rw-r--r--meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb4
-rw-r--r--meta-freedesktop/recipes-devtools/rpm/rpm/check-rpath-self.patch13
-rw-r--r--meta-freedesktop/recipes-devtools/rpm/rpm_4.11.2.bbappend4
3 files changed, 0 insertions, 21 deletions
diff --git a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb
index 11e7a20..d956765 100644
--- a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb
+++ b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb
@@ -19,7 +19,6 @@ RDEPENDS_${PN} += " \
diffutils \
file \
patch \
- rpm \
strace \
\
autoconf \
@@ -153,9 +152,6 @@ RDEPENDS_${PN} += " \
popt-dev \
readline-dev \
\
- python-smartpm \
- smartpm \
- \
perl-dev \
perl-module-anydbm-file \
perl-module-app-cpan \
diff --git a/meta-freedesktop/recipes-devtools/rpm/rpm/check-rpath-self.patch b/meta-freedesktop/recipes-devtools/rpm/rpm/check-rpath-self.patch
deleted file mode 100644
index 44fdecf..0000000
--- a/meta-freedesktop/recipes-devtools/rpm/rpm/check-rpath-self.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up rpm-4.11.2/scripts/check-rpaths-worker.self_rpath rpm-4.11.2/scripts/check-rpaths-worker
---- rpm-4.11.2/scripts/check-rpaths-worker.self_rpath 2015-03-27 10:35:28.096079208 +0100
-+++ rpm-4.11.2/scripts/check-rpaths-worker 2015-03-27 10:36:00.209613179 +0100
-@@ -120,6 +120,9 @@ for i; do
- (/lib64/*|/usr/lib64/*|/usr/X11R6/lib64/*|/usr/local/lib64/*)
- badness=0;;
-
-+ (/app/lib/*|/app/lib)
-+ badness=0;;
-+
- (\$ORIGIN|\${ORIGINX}|\$ORIGIN/*|\${ORIGINX}/*)
- test $allow_ORIGIN -eq 0 && badness=8 || {
- badness=0
diff --git a/meta-freedesktop/recipes-devtools/rpm/rpm_4.11.2.bbappend b/meta-freedesktop/recipes-devtools/rpm/rpm_4.11.2.bbappend
deleted file mode 100644
index 8ecae0c..0000000
--- a/meta-freedesktop/recipes-devtools/rpm/rpm_4.11.2.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-SRC_URI += "\
- file://check-rpath-self.patch \
- "