[OE-core] [PATCH] boost: drop arm-intrinsics.patch
This patch makes gcc produce broken code. It is unclear why it is there
in the first place. Drop it.
Signed-off-by: Mans Rullgard
---
.../boost/boost/arm-intrinsics.patch | 55 ---
meta/recipes-support/boost/boost_1.75.0.bb| 2 +-
2 files changed, 1 insertion(+), 56 deletions(-)
delete mode 100644 meta/recipes-support/boost/boost/arm-intrinsics.patch
diff --git a/meta/recipes-support/boost/boost/arm-intrinsics.patch
b/meta/recipes-support/boost/boost/arm-intrinsics.patch
deleted file mode 100644
index fe85c69a827a..
--- a/meta/recipes-support/boost/boost/arm-intrinsics.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Upstream-Status: Backport
-
-8/17/2010 - rebased to 1.44 by Qing He
-
-diff --git a/boost/smart_ptr/detail/atomic_count_sync.hpp
b/boost/smart_ptr/detail/atomic_count_sync.hpp
-index b6359b5..78b1cc2 100644
a/boost/smart_ptr/detail/atomic_count_sync.hpp
-+++ b/boost/smart_ptr/detail/atomic_count_sync.hpp
-@@ -33,17 +33,46 @@ public:
-
- long operator++()
- {
-+#ifdef __ARM_ARCH_7A__
-+ int v1, tmp;
-+ asm volatile ("1: \n\t"
-+ "ldrex %0, %1 \n\t"
-+ "add %0 ,%0, #1 \n\t"
-+ "strex %2, %0, %1 \n\t"
-+ "cmp %2, #0 \n\t"
-+ "bne 1b \n\t"
-+ : "=" (v1), "+Q"(value_), "="(tmp)
-+);
-+#else
- return __sync_add_and_fetch( _, 1 );
-+#endif
- }
-
- long operator--()
- {
-+#ifdef __ARM_ARCH_7A__
-+ int v1, tmp;
-+ asm volatile ("1: \n\t"
-+ "ldrex %0, %1 \n\t"
-+ "sub %0 ,%0, #1 \n\t"
-+ "strex %2, %0, %1 \n\t"
-+ "cmp %2, #0 \n\t"
-+ "bne 1b \n\t"
-+ : "=" (v1), "+Q"(value_), "="(tmp)
-+);
-+ return value_;
-+#else
- return __sync_add_and_fetch( _, -1 );
-+#endif
- }
-
- operator long() const
- {
-+#if __ARM_ARCH_7A__
-+return value_;
-+#else
- return __sync_fetch_and_add( _, 0 );
-+#endif
- }
-
- private:
diff --git a/meta/recipes-support/boost/boost_1.75.0.bb
b/meta/recipes-support/boost/boost_1.75.0.bb
index 33137e236dba..23b0ffc67e29 100644
--- a/meta/recipes-support/boost/boost_1.75.0.bb
+++ b/meta/recipes-support/boost/boost_1.75.0.bb
@@ -1,7 +1,7 @@
require boost-${PV}.inc
require boost.inc
-SRC_URI += "file://arm-intrinsics.patch \
+SRC_URI += " \
file://boost-CVE-2012-2677.patch \
file://boost-math-disable-pch-for-gcc.patch \
file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
--
2.30.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#146873):
https://lists.openembedded.org/g/openembedded-core/message/146873
Mute This Topic: https://lists.openembedded.org/mt/79727098/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] initscripts: populate-volatile: don't run commands in background
If commands are run asynchronously they may be completed out of
order causing problems if later entries depend on earlier ones.
Signed-off-by: Mans Rullgard <m...@mansr.com>
---
meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 91514bac86fa..cf0d2bf96610 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -36,7 +36,7 @@ create_file() {
[ "${VERBOSE}" != "no" ] && echo "Target already exists.
Skipping."
} || {
if [ -z "$ROOT_DIR" ]; then
- eval $EXEC &
+ eval $EXEC
else
# Creating some files at rootfs time may fail and
should fail,
# but these failures should not be logged to make sure
the do_rootfs
@@ -86,7 +86,7 @@ link_file() {
test "$VOLATILE_ENABLE_CACHE" = yes && echo " $EXEC" >>
/etc/volatile.cache.build
if [ -z "$ROOT_DIR" ]; then
- eval $EXEC &
+ eval $EXEC
else
# For the same reason with create_file(), failures should
# not be logged.
@@ -187,7 +187,7 @@ apply_cfgfile() {
case "${TTYPE}" in
"f") [ "${VERBOSE}" != "no" ] && echo "Creating file
-${TNAME}-."
- create_file "${TNAME}" &
+ create_file "${TNAME}"
;;
"d") [ "${VERBOSE}" != "no" ] && echo "Creating
directory -${TNAME}-."
mk_dir "${TNAME}"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] initscripts: populate-volatile: improve config file parsing
This improves the config file parsing to permit blank lines and
comments following an entry or preceeded by whitespace.
Signed-off-by: Mans Rullgard <m...@mansr.com>
---
meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | 6 +++---
meta/recipes-core/initscripts/initscripts-1.0/volatiles| 6 --
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index ce4622a5e555..91514bac86fa 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -150,9 +150,9 @@ apply_cfgfile() {
return 1
}
- cat ${CFGFILE} | grep -v "^#" | \
- while read LINE; do
- eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\
\(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5
TLTARGET=\6/p"`
+ cat ${CFGFILE} | sed 's/#.*//' | \
+ while read TTYPE TUSER TGROUP TMODE TNAME TLTARGET; do
+ test -z "${TLTARGET}" && continue
TNAME=${ROOT_DIR}${TNAME}
[ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
index 297245d0e40e..bc17c4553da2 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
@@ -1,11 +1,13 @@
# This configuration file lists filesystem objects that should get verified
# during startup and be created if missing.
#
-# Every line must either be a comment starting with #
-# or a definition of format:
+# Entries have the following format:
#
# where the items are separated by whitespace !
#
+# The # character introduces a comment lasting until end of line.
+# Blank lines are ignored.
+#
# : d|f|l : (d)irectory|(f)ile|(l)ink
#
# A linking example:
--
2.10.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
