* [PATCH v2 2/8] babeltrace: move ASNEEDED over-ride into the babeltrace recipe
2018-05-09 21:46 [PATCH v2 1/8] tune-corei7.inc: minor comment tweak to align with tune-core2.inc Andre McCurdy
@ 2018-05-09 21:46 ` Andre McCurdy
2018-05-09 22:04 ` Khem Raj
2018-05-09 21:46 ` [PATCH v2 3/8] console-tools: move ASNEEDED over-ride into the console-tools recipe Andre McCurdy
` (5 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Andre McCurdy @ 2018-05-09 21:46 UTC (permalink / raw)
To: openembedded-core
Move the recipe specific over-ride for ASNEEDED into the recipe to
make it more apparent that the over-ride is being applied (and that
it should be re-checked on version updates, etc).
Also misc minor recipe cleanup (re-order variables to follow the OE
style guide, etc).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/conf/distro/include/as-needed.inc | 1 -
meta/recipes-kernel/lttng/babeltrace_1.5.5.bb | 12 ++++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
index 6a8ad9d..38de3a1 100644
--- a/meta/conf/distro/include/as-needed.inc
+++ b/meta/conf/distro/include/as-needed.inc
@@ -1,7 +1,6 @@
ASNEEDED = "-Wl,--as-needed"
-ASNEEDED_pn-babeltrace = ""
ASNEEDED_pn-console-tools = ""
ASNEEDED_pn-distcc = ""
ASNEEDED_pn-openobex = ""
diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
index 5d7a7ef..2a2fa1e 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
@@ -2,18 +2,18 @@ SUMMARY = "Babeltrace - Trace Format Babel Tower"
DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log."
HOMEPAGE = "http://www.efficios.com/babeltrace/"
BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace"
-
LICENSE = "MIT & GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa"
DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
-inherit autotools pkgconfig
+SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5"
+SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e"
+
+S = "${WORKDIR}/git"
-SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \
-"
+inherit autotools pkgconfig
EXTRA_OECONF = "--disable-debug-info"
-S = "${WORKDIR}/git"
-SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e"
+ASNEEDED = ""
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2 2/8] babeltrace: move ASNEEDED over-ride into the babeltrace recipe
2018-05-09 21:46 ` [PATCH v2 2/8] babeltrace: move ASNEEDED over-ride into the babeltrace recipe Andre McCurdy
@ 2018-05-09 22:04 ` Khem Raj
2018-05-09 22:52 ` Andre McCurdy
0 siblings, 1 reply; 10+ messages in thread
From: Khem Raj @ 2018-05-09 22:04 UTC (permalink / raw)
To: Andre McCurdy; +Cc: Patches and discussions about the oe-core layer
On Wed, May 9, 2018 at 2:46 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> Move the recipe specific over-ride for ASNEEDED into the recipe to
> make it more apparent that the over-ride is being applied (and that
> it should be re-checked on version updates, etc).
>
I think this patchset is good however two things, squash all Oe-core as-needed
moves to one commit. secondly, check if they are still needed, if so then a line
or two documenting what the problem is may be as a followup
Thirdly, deleted as-needed.inc and append this option to TARGET_LDFLAGS
directly in bitbake.conf
> Also misc minor recipe cleanup (re-order variables to follow the OE
> style guide, etc).
>
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ---
> meta/conf/distro/include/as-needed.inc | 1 -
> meta/recipes-kernel/lttng/babeltrace_1.5.5.bb | 12 ++++++------
> 2 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
> index 6a8ad9d..38de3a1 100644
> --- a/meta/conf/distro/include/as-needed.inc
> +++ b/meta/conf/distro/include/as-needed.inc
> @@ -1,7 +1,6 @@
>
> ASNEEDED = "-Wl,--as-needed"
>
> -ASNEEDED_pn-babeltrace = ""
> ASNEEDED_pn-console-tools = ""
> ASNEEDED_pn-distcc = ""
> ASNEEDED_pn-openobex = ""
> diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
> index 5d7a7ef..2a2fa1e 100644
> --- a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
> +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
> @@ -2,18 +2,18 @@ SUMMARY = "Babeltrace - Trace Format Babel Tower"
> DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log."
> HOMEPAGE = "http://www.efficios.com/babeltrace/"
> BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace"
> -
> LICENSE = "MIT & GPLv2"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa"
>
> DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
>
> -inherit autotools pkgconfig
> +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5"
> +SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e"
> +
> +S = "${WORKDIR}/git"
>
> -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \
> -"
> +inherit autotools pkgconfig
>
> EXTRA_OECONF = "--disable-debug-info"
>
> -S = "${WORKDIR}/git"
> -SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e"
> +ASNEEDED = ""
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v2 2/8] babeltrace: move ASNEEDED over-ride into the babeltrace recipe
2018-05-09 22:04 ` Khem Raj
@ 2018-05-09 22:52 ` Andre McCurdy
0 siblings, 0 replies; 10+ messages in thread
From: Andre McCurdy @ 2018-05-09 22:52 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On Wed, May 9, 2018 at 3:04 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Wed, May 9, 2018 at 2:46 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
>> Move the recipe specific over-ride for ASNEEDED into the recipe to
>> make it more apparent that the over-ride is being applied (and that
>> it should be re-checked on version updates, etc).
>>
>
> I think this patchset is good however two things, squash all Oe-core as-needed
> moves to one commit.
As someone who regularly backports upstream changes to maintenance
branches, single oe-core commits which touch multiple recipes are a
bit of a pain to deal with... so I'd prefer to keep one commit per
recipe unless there's a clear reason not to?
> secondly, check if they are still needed, if so then a line
> or two documenting what the problem is may be as a followup
Determining whether ASNEEDED needs to be over-ridden isn't always
straightforward as the symptoms of getting it wrong may only show up
at run time. I can do some testing but perhaps the maintainers of
these recipes should be involved with that too. I agree that should be
a followup task.
> Thirdly, deleted as-needed.inc and append this option to TARGET_LDFLAGS
> directly in bitbake.conf
Yes, I'm planning to do that.
>> Also misc minor recipe cleanup (re-order variables to follow the OE
>> style guide, etc).
>>
>> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
>> ---
>> meta/conf/distro/include/as-needed.inc | 1 -
>> meta/recipes-kernel/lttng/babeltrace_1.5.5.bb | 12 ++++++------
>> 2 files changed, 6 insertions(+), 7 deletions(-)
>>
>> diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
>> index 6a8ad9d..38de3a1 100644
>> --- a/meta/conf/distro/include/as-needed.inc
>> +++ b/meta/conf/distro/include/as-needed.inc
>> @@ -1,7 +1,6 @@
>>
>> ASNEEDED = "-Wl,--as-needed"
>>
>> -ASNEEDED_pn-babeltrace = ""
>> ASNEEDED_pn-console-tools = ""
>> ASNEEDED_pn-distcc = ""
>> ASNEEDED_pn-openobex = ""
>> diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
>> index 5d7a7ef..2a2fa1e 100644
>> --- a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
>> +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
>> @@ -2,18 +2,18 @@ SUMMARY = "Babeltrace - Trace Format Babel Tower"
>> DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log."
>> HOMEPAGE = "http://www.efficios.com/babeltrace/"
>> BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace"
>> -
>> LICENSE = "MIT & GPLv2"
>> LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa"
>>
>> DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
>>
>> -inherit autotools pkgconfig
>> +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5"
>> +SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e"
>> +
>> +S = "${WORKDIR}/git"
>>
>> -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \
>> -"
>> +inherit autotools pkgconfig
>>
>> EXTRA_OECONF = "--disable-debug-info"
>>
>> -S = "${WORKDIR}/git"
>> -SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e"
>> +ASNEEDED = ""
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 3/8] console-tools: move ASNEEDED over-ride into the console-tools recipe
2018-05-09 21:46 [PATCH v2 1/8] tune-corei7.inc: minor comment tweak to align with tune-core2.inc Andre McCurdy
2018-05-09 21:46 ` [PATCH v2 2/8] babeltrace: move ASNEEDED over-ride into the babeltrace recipe Andre McCurdy
@ 2018-05-09 21:46 ` Andre McCurdy
2018-05-09 21:46 ` [PATCH v2 4/8] distcc: move ASNEEDED over-ride into the distcc recipe Andre McCurdy
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Andre McCurdy @ 2018-05-09 21:46 UTC (permalink / raw)
To: openembedded-core
Move the recipe specific over-ride for ASNEEDED into the recipe to
make it more apparent that the over-ride is being applied (and that
it should be re-checked on version updates, etc).
Also misc minor recipe cleanup (re-order variables to follow the OE
style guide, etc).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/conf/distro/include/as-needed.inc | 1 -
meta/recipes-core/console-tools/console-tools_0.3.2.bb | 10 ++++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
index 38de3a1..91c0762 100644
--- a/meta/conf/distro/include/as-needed.inc
+++ b/meta/conf/distro/include/as-needed.inc
@@ -1,7 +1,6 @@
ASNEEDED = "-Wl,--as-needed"
-ASNEEDED_pn-console-tools = ""
ASNEEDED_pn-distcc = ""
ASNEEDED_pn-openobex = ""
ASNEEDED_pn-icu = ""
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index 286c2a4..6b9c828 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -1,8 +1,8 @@
+SUMMARY = "Allows you to set-up and manipulate the Linux console"
+DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files."
SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9"
-SUMMARY = "Allows you to set-up and manipulate the Linux console"
-DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files."
PR = "r8"
SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
@@ -26,8 +26,12 @@ SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lct/files/console-tools-devel/"
UPSTREAM_CHECK_REGEX = "/console-tools-devel/(?P<pver>(\d\d?\.)+\d\d?)/"
+inherit autotools gettext update-alternatives
+
CFLAGS_append_aarch64 = " -D_USE_TERMIOS "
+ASNEEDED = ""
+
do_configure_prepend () {
mkdir -p ${S}/m4
cp ${WORKDIR}/lcmessage.m4 ${S}/m4/
@@ -35,8 +39,6 @@ do_configure_prepend () {
cp ${WORKDIR}/Makevars ${S}/po/
}
-inherit autotools gettext update-alternatives
-
ALTERNATIVE_PRIORITY = "30"
bindir_progs = "chvt deallocvt fgconsole openvt"
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 4/8] distcc: move ASNEEDED over-ride into the distcc recipe
2018-05-09 21:46 [PATCH v2 1/8] tune-corei7.inc: minor comment tweak to align with tune-core2.inc Andre McCurdy
2018-05-09 21:46 ` [PATCH v2 2/8] babeltrace: move ASNEEDED over-ride into the babeltrace recipe Andre McCurdy
2018-05-09 21:46 ` [PATCH v2 3/8] console-tools: move ASNEEDED over-ride into the console-tools recipe Andre McCurdy
@ 2018-05-09 21:46 ` Andre McCurdy
2018-05-09 21:46 ` [PATCH v2 5/8] icu: move ASNEEDED over-ride into icu.inc Andre McCurdy
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Andre McCurdy @ 2018-05-09 21:46 UTC (permalink / raw)
To: openembedded-core
Move the recipe specific over-ride for ASNEEDED into the recipe to
make it more apparent that the over-ride is being applied (and that
it should be re-checked on version updates, etc).
Also misc minor recipe cleanup (re-order variables to follow the OE
style guide, etc).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/conf/distro/include/as-needed.inc | 1 -
meta/recipes-devtools/distcc/distcc_3.2.bb | 29 ++++++++++++++++++++---------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
index 91c0762..94f5b90 100644
--- a/meta/conf/distro/include/as-needed.inc
+++ b/meta/conf/distro/include/as-needed.inc
@@ -1,7 +1,6 @@
ASNEEDED = "-Wl,--as-needed"
-ASNEEDED_pn-distcc = ""
ASNEEDED_pn-openobex = ""
ASNEEDED_pn-icu = ""
ASNEEDED_pn-pciutils = ""
diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.2.bb
index ff0e22f..9f752ed 100644
--- a/meta/recipes-devtools/distcc/distcc_3.2.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.2.bb
@@ -7,13 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "avahi binutils"
-PACKAGECONFIG ??= "popt"
-PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+"
-# use system popt by default
-PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
-
-RRECOMMENDS_${PN} = "avahi-daemon"
-
SRC_URI = "git://github.com/akuster/distcc.git;branch=${PV} \
file://separatebuilddir.patch \
file://0001-zeroconf-Include-fcntl.h.patch \
@@ -21,12 +14,26 @@ SRC_URI = "git://github.com/akuster/distcc.git;branch=${PV} \
file://distccmon-gnome.desktop \
file://distcc \
file://distcc.service"
+
SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c"
+
S = "${WORKDIR}/git"
inherit autotools pkgconfig update-rc.d useradd systemd
-EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode"
+PACKAGECONFIG ??= "popt"
+
+PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+"
+# use system popt by default
+PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
+
+EXTRA_OECONF += " \
+ --disable-pump-mode \
+ --disable-Werror \
+ PYTHON='' \
+"
+
+ASNEEDED = ""
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--system \
@@ -50,18 +57,22 @@ do_install_append() {
sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service
${DESKTOPINSTALL}
}
+
DESKTOPINSTALL = ""
DESKTOPINSTALL_libc-glibc () {
install -d ${D}${datadir}/distcc/
install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/
}
+
PACKAGES += "distcc-distmon-gnome"
FILES_${PN} = " ${sysconfdir} \
${bindir}/distcc \
- ${bindir}/lsdistcc \
+ ${bindir}/lsdistcc \
${bindir}/distccd \
${bindir}/distccmon-text \
${systemd_unitdir}/system/distcc.service"
FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
${datadir}/distcc"
+
+RRECOMMENDS_${PN} = "avahi-daemon"
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 5/8] icu: move ASNEEDED over-ride into icu.inc
2018-05-09 21:46 [PATCH v2 1/8] tune-corei7.inc: minor comment tweak to align with tune-core2.inc Andre McCurdy
` (2 preceding siblings ...)
2018-05-09 21:46 ` [PATCH v2 4/8] distcc: move ASNEEDED over-ride into the distcc recipe Andre McCurdy
@ 2018-05-09 21:46 ` Andre McCurdy
2018-05-09 21:46 ` [PATCH v2 6/8] pciutils: move ASNEEDED over-ride into the pciutils recipe Andre McCurdy
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Andre McCurdy @ 2018-05-09 21:46 UTC (permalink / raw)
To: openembedded-core
Move the recipe specific over-ride for ASNEEDED into the recipe to
make it more apparent that the over-ride is being applied (and that
it should be re-checked on version updates, etc).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/conf/distro/include/as-needed.inc | 1 -
meta/recipes-support/icu/icu.inc | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
index 94f5b90..305e654 100644
--- a/meta/conf/distro/include/as-needed.inc
+++ b/meta/conf/distro/include/as-needed.inc
@@ -2,7 +2,6 @@
ASNEEDED = "-Wl,--as-needed"
ASNEEDED_pn-openobex = ""
-ASNEEDED_pn-icu = ""
ASNEEDED_pn-pciutils = ""
ASNEEDED_pn-puzzles = ""
ASNEEDED_pn-rpm = ""
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc
index 983118c..f0786ba 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/meta/recipes-support/icu/icu.inc
@@ -31,6 +31,8 @@ EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
+ASNEEDED = ""
+
# strtod_l() is not supported by musl; also xlocale.h is missing
# It is not possible to disable its use via configure switches or env vars
# so monkey patching is needed.
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 6/8] pciutils: move ASNEEDED over-ride into the pciutils recipe
2018-05-09 21:46 [PATCH v2 1/8] tune-corei7.inc: minor comment tweak to align with tune-core2.inc Andre McCurdy
` (3 preceding siblings ...)
2018-05-09 21:46 ` [PATCH v2 5/8] icu: move ASNEEDED over-ride into icu.inc Andre McCurdy
@ 2018-05-09 21:46 ` Andre McCurdy
2018-05-09 21:46 ` [PATCH v2 7/8] puzzles: move ASNEEDED over-ride into the puzzles recipe Andre McCurdy
2018-05-09 21:46 ` [PATCH v2 8/8] rpm: move ASNEEDED over-ride into the rpm recipe Andre McCurdy
6 siblings, 0 replies; 10+ messages in thread
From: Andre McCurdy @ 2018-05-09 21:46 UTC (permalink / raw)
To: openembedded-core
Move the recipe specific over-ride for ASNEEDED into the recipe to
make it more apparent that the over-ride is being applied (and that
it should be re-checked on version updates, etc).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/conf/distro/include/as-needed.inc | 1 -
meta/recipes-bsp/pciutils/pciutils_3.5.6.bb | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
index 305e654..c67f2f3 100644
--- a/meta/conf/distro/include/as-needed.inc
+++ b/meta/conf/distro/include/as-needed.inc
@@ -2,7 +2,6 @@
ASNEEDED = "-Wl,--as-needed"
ASNEEDED_pn-openobex = ""
-ASNEEDED_pn-pciutils = ""
ASNEEDED_pn-puzzles = ""
ASNEEDED_pn-rpm = ""
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb b/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb
index b18b7da..de974ed 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb
@@ -38,6 +38,8 @@ export MANDIR = "${mandir}"
EXTRA_OEMAKE = "-e MAKEFLAGS= ${PCI_CONF_FLAG}"
+ASNEEDED = ""
+
# The configure script breaks if the HOST variable is set
HOST[unexport] = "1"
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 7/8] puzzles: move ASNEEDED over-ride into the puzzles recipe
2018-05-09 21:46 [PATCH v2 1/8] tune-corei7.inc: minor comment tweak to align with tune-core2.inc Andre McCurdy
` (4 preceding siblings ...)
2018-05-09 21:46 ` [PATCH v2 6/8] pciutils: move ASNEEDED over-ride into the pciutils recipe Andre McCurdy
@ 2018-05-09 21:46 ` Andre McCurdy
2018-05-09 21:46 ` [PATCH v2 8/8] rpm: move ASNEEDED over-ride into the rpm recipe Andre McCurdy
6 siblings, 0 replies; 10+ messages in thread
From: Andre McCurdy @ 2018-05-09 21:46 UTC (permalink / raw)
To: openembedded-core
Move the recipe specific over-ride for ASNEEDED into the recipe to
make it more apparent that the over-ride is being applied (and that
it should be re-checked on version updates, etc).
Also misc minor recipe cleanup (re-order variables to follow the OE
style guide, etc).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/conf/distro/include/as-needed.inc | 1 -
meta/recipes-sato/puzzles/puzzles_git.bb | 35 +++++++++++++++++---------------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
index c67f2f3..f56d432 100644
--- a/meta/conf/distro/include/as-needed.inc
+++ b/meta/conf/distro/include/as-needed.inc
@@ -2,7 +2,6 @@
ASNEEDED = "-Wl,--as-needed"
ASNEEDED_pn-openobex = ""
-ASNEEDED_pn-puzzles = ""
ASNEEDED_pn-rpm = ""
TARGET_LDFLAGS += "${ASNEEDED}"
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 3670ab8..7d08b96 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -1,20 +1,20 @@
SUMMARY = "Simon Tatham's Portable Puzzle Collection"
HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b"
DEPENDS = "libxt"
# The libxt requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b"
-
SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
file://fix-compiling-failure-with-option-g-O.patch \
file://0001-Use-labs-instead-of-abs.patch \
file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \
file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
"
+
UPSTREAM_CHECK_COMMITS = "1"
SRCREV = "c6e0161dd475415316ed66dc82794d68e52f0025"
PE = "2"
@@ -24,24 +24,13 @@ S = "${WORKDIR}/git"
inherit autotools distro_features_check pkgconfig
-CFLAGS_append = " -Wno-deprecated-declarations"
-
PACKAGECONFIG ??= "gtk3"
PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+,"
PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3,"
-PACKAGES += "${PN}-extra"
-FILES_${PN} = ""
-FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications"
+CFLAGS_append = " -Wno-deprecated-declarations"
-python __anonymous () {
- var = d.expand("FILES_${PN}")
- data = d.getVar(var, False)
- for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
- data = data + " ${bindir}/%s" % name
- data = data + " ${datadir}/applications/%s.desktop" % name
- d.setVar(var, data)
-}
+ASNEEDED = ""
do_configure_prepend () {
cd ${S}
@@ -74,3 +63,17 @@ STOP
fi
done
}
+
+PACKAGES += "${PN}-extra"
+
+FILES_${PN} = ""
+FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications"
+
+python __anonymous () {
+ var = d.expand("FILES_${PN}")
+ data = d.getVar(var, False)
+ for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
+ data = data + " ${bindir}/%s" % name
+ data = data + " ${datadir}/applications/%s.desktop" % name
+ d.setVar(var, data)
+}
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 8/8] rpm: move ASNEEDED over-ride into the rpm recipe
2018-05-09 21:46 [PATCH v2 1/8] tune-corei7.inc: minor comment tweak to align with tune-core2.inc Andre McCurdy
` (5 preceding siblings ...)
2018-05-09 21:46 ` [PATCH v2 7/8] puzzles: move ASNEEDED over-ride into the puzzles recipe Andre McCurdy
@ 2018-05-09 21:46 ` Andre McCurdy
6 siblings, 0 replies; 10+ messages in thread
From: Andre McCurdy @ 2018-05-09 21:46 UTC (permalink / raw)
To: openembedded-core
Move the recipe specific over-ride for ASNEEDED into the recipe to
make it more apparent that the over-ride is being applied (and that
it should be re-checked on version updates, etc).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/conf/distro/include/as-needed.inc | 1 -
meta/recipes-devtools/rpm/rpm_4.14.1.bb | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
index f56d432..9c23564 100644
--- a/meta/conf/distro/include/as-needed.inc
+++ b/meta/conf/distro/include/as-needed.inc
@@ -2,6 +2,5 @@
ASNEEDED = "-Wl,--as-needed"
ASNEEDED_pn-openobex = ""
-ASNEEDED_pn-rpm = ""
TARGET_LDFLAGS += "${ASNEEDED}"
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.1.bb b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
index 818d3ef..d49530e 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
@@ -73,6 +73,8 @@ BBCLASSEXTEND = "native nativesdk"
PACKAGECONFIG ??= ""
PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils"
+ASNEEDED = ""
+
# Direct rpm-native to read configuration from our sysroot, not the one it was compiled in
# libmagic also has sysroot path contamination, so override it
do_install_append_class-native() {
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread