diff options
| author | Alexander Larsson <alexl@redhat.com> | 2015-03-27 11:39:47 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2015-03-27 11:39:47 +0100 |
| commit | 4a7f5341ec3a1b8081f6246ae0444a4c0f7409b2 (patch) | |
| tree | 57f66bde6c5b7619ffd6cf3cad5f5310795bd2b4 | |
| parent | 8e6d1e5b50a962710a63f544531b6676513ed565 (diff) | |
Make rpms check-rpath tool accept /self/lib rpaths
| -rw-r--r-- | meta-freedesktop/recipes-devtools/rpm/rpm/check-rpath-self.patch | 13 | ||||
| -rw-r--r-- | meta-freedesktop/recipes-devtools/rpm/rpm_4.11.2.bbappend | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/meta-freedesktop/recipes-devtools/rpm/rpm/check-rpath-self.patch b/meta-freedesktop/recipes-devtools/rpm/rpm/check-rpath-self.patch new file mode 100644 index 0000000..6fe1fba --- /dev/null +++ b/meta-freedesktop/recipes-devtools/rpm/rpm/check-rpath-self.patch @@ -0,0 +1,13 @@ +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;; + ++ (/self/lib/*|/self/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 new file mode 100644 index 0000000..8ecae0c --- /dev/null +++ b/meta-freedesktop/recipes-devtools/rpm/rpm_4.11.2.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI += "\ + file://check-rpath-self.patch \ + " |