diff options
| author | Mingli Yu <mingli.yu@windriver.com> | 2022-08-11 17:40:12 +0800 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2022-08-25 08:14:21 -0400 |
| commit | ea5bb2f2e7c3e4e3b7879b05085af6e537355fdd (patch) | |
| tree | 335569f3c7ab9f74a2d411091eb0b83a79b6ffd9 | |
| parent | 571af37e9c93fc4030794494f1d128a4457afe13 (diff) | |
| download | meta-security-ea5bb2f2e7c3e4e3b7879b05085af6e537355fdd.tar.gz | |
samhain-standalone: fix buildpaths issue
Fixes:
WARNING: samhain-standalone-4.4.9-r0 do_package_qa: QA Issue: File /usr/share/doc/samhain-standalone/scripts/samhain.ebuild-light in package samhain-standalone-doc contains reference to TMPDIR
File /usr/share/doc/samhain-standalone/scripts/samhain.ebuild in package samhain-standalone-doc contains reference to TMPDIR [buildpaths]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | recipes-ids/samhain/files/0001-Don-t-expose-configure-args.patch | 44 | ||||
| -rw-r--r-- | recipes-ids/samhain/samhain-standalone.bb | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/recipes-ids/samhain/files/0001-Don-t-expose-configure-args.patch b/recipes-ids/samhain/files/0001-Don-t-expose-configure-args.patch new file mode 100644 index 0000000..fedbe5b --- /dev/null +++ b/recipes-ids/samhain/files/0001-Don-t-expose-configure-args.patch | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | From 111b1e8f35e989513d8961a45a806767109f6e1e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Thu, 11 Aug 2022 17:15:30 +0800 | ||
| 4 | Subject: [PATCH] Don't expose configure args | ||
| 5 | |||
| 6 | Don't expost configure args to fix buildpath issue. | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [oe specific] | ||
| 9 | |||
| 10 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 11 | --- | ||
| 12 | scripts/samhain.ebuild-light.in | 2 +- | ||
| 13 | scripts/samhain.ebuild.in | 2 +- | ||
| 14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/scripts/samhain.ebuild-light.in b/scripts/samhain.ebuild-light.in | ||
| 17 | index 2b09cdb..b7f7062 100644 | ||
| 18 | --- a/scripts/samhain.ebuild-light.in | ||
| 19 | +++ b/scripts/samhain.ebuild-light.in | ||
| 20 | @@ -55,7 +55,7 @@ src_compile() { | ||
| 21 | # --with-state-dir=/var/lib/${PN} \ | ||
| 22 | # --with-log-file=/var/log/${PN}.log \ | ||
| 23 | |||
| 24 | - ./configure ${myconf} @mydefargs@ || die | ||
| 25 | + ./configure ${myconf} mydefargs || die | ||
| 26 | emake || die | ||
| 27 | |||
| 28 | echo '#!/bin/sh' > ./sstrip | ||
| 29 | diff --git a/scripts/samhain.ebuild.in b/scripts/samhain.ebuild.in | ||
| 30 | index 635a746..b9a42e7 100644 | ||
| 31 | --- a/scripts/samhain.ebuild.in | ||
| 32 | +++ b/scripts/samhain.ebuild.in | ||
| 33 | @@ -55,7 +55,7 @@ src_compile() { | ||
| 34 | # --with-state-dir=/var/lib/${PN} \ | ||
| 35 | # --with-log-file=/var/log/${PN}.log \ | ||
| 36 | |||
| 37 | - ./configure ${myconf} @mydefargs@ || die | ||
| 38 | + ./configure ${myconf} mydefargs || die | ||
| 39 | emake || die | ||
| 40 | |||
| 41 | echo '#!/bin/sh' > ./sstrip | ||
| 42 | -- | ||
| 43 | 2.25.1 | ||
| 44 | |||
diff --git a/recipes-ids/samhain/samhain-standalone.bb b/recipes-ids/samhain/samhain-standalone.bb index 445cb99..b832dc8 100644 --- a/recipes-ids/samhain/samhain-standalone.bb +++ b/recipes-ids/samhain/samhain-standalone.bb | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | require samhain.inc | 1 | require samhain.inc |
| 2 | 2 | ||
| 3 | SRC_URI += "file://samhain-not-run-ptest-on-host.patch \ | 3 | SRC_URI += "file://samhain-not-run-ptest-on-host.patch \ |
| 4 | file://0001-Don-t-expose-configure-args.patch \ | ||
| 4 | file://run-ptest \ | 5 | file://run-ptest \ |
| 5 | " | 6 | " |
| 6 | 7 | ||
