* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 99a79bcbd89de07e108b836fe7d19bd26aeb02c3
@ 2022-05-05 21:18 Peter Müller
0 siblings, 0 replies; only message in thread
From: Peter Müller @ 2022-05-05 21:18 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6273 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 99a79bcbd89de07e108b836fe7d19bd26aeb02c3 (commit)
via 568215c84bb52ad09d7df43492eb61d99e343ac3 (commit)
from 5ecf056d52b007a413db0477254a3600fef1d81c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 99a79bcbd89de07e108b836fe7d19bd26aeb02c3
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu May 5 21:17:47 2022 +0000
Revert "Core Update 168: Ship boost and delete orphaned libraries"
This reverts commit 3bd471b8203b878e9e270d833d49e08921c584e3.
commit 568215c84bb52ad09d7df43492eb61d99e343ac3
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Thu May 5 21:16:45 2022 +0000
Revert "boost: Fix rootfile entries that referred to python3.8 instead of 3.10"
This reverts commit 05a1fe1362b633b82b696a88801bb29fb1070872.
For some reason, the rootfile changes introduced with this patch break
the build, as they do not seem to be present. Needs further
investigation.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aarch64/boost | 8 ++++----
config/rootfiles/common/armv6l/boost | 8 ++++----
config/rootfiles/common/x86_64/boost | 8 ++++----
config/rootfiles/core/168/filelists/aarch64/boost | 1 -
config/rootfiles/core/168/filelists/armv6l/boost | 1 -
config/rootfiles/core/168/filelists/x86_64/boost | 1 -
config/rootfiles/core/168/update.sh | 1 -
7 files changed, 12 insertions(+), 16 deletions(-)
delete mode 120000 config/rootfiles/core/168/filelists/aarch64/boost
delete mode 120000 config/rootfiles/core/168/filelists/armv6l/boost
delete mode 120000 config/rootfiles/core/168/filelists/x86_64/boost
Difference in files:
diff --git a/config/rootfiles/common/aarch64/boost b/config/rootfiles/common/aarch64/boost
index 015dc1458..49ff120ab 100644
--- a/config/rootfiles/common/aarch64/boost
+++ b/config/rootfiles/common/aarch64/boost
@@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-a64.so.1.76.0
usr/lib/libboost_prg_exec_monitor-mt-a64.so.1.76.0
#usr/lib/libboost_prg_exec_monitor-a64.so
usr/lib/libboost_prg_exec_monitor-a64.so.1.76.0
-#usr/lib/libboost_python310-mt-a64.so
-usr/lib/libboost_python310-mt-a64.so.1.76.0
-#usr/lib/libboost_python310-a64.so
-usr/lib/libboost_python310-a64.so.1.76.0
+#usr/lib/libboost_python38-mt-a64.so
+usr/lib/libboost_python38-mt-a64.so.1.76.0
+#usr/lib/libboost_python38-a64.so
+usr/lib/libboost_python38-a64.so.1.76.0
#usr/lib/libboost_random-mt-a64.so
usr/lib/libboost_random-mt-a64.so.1.76.0
#usr/lib/libboost_random-a64.so
diff --git a/config/rootfiles/common/armv6l/boost b/config/rootfiles/common/armv6l/boost
index 79e9ed3d7..80cc4063a 100644
--- a/config/rootfiles/common/armv6l/boost
+++ b/config/rootfiles/common/armv6l/boost
@@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-mt-a32.so.1.76.0
usr/lib/libboost_prg_exec_monitor-a32.so.1.76.0
#usr/lib/libboost_prg_exec_monitor-mt-a32.so
usr/lib/libboost_prg_exec_monitor-mt-a32.so.1.76.0
-#usr/lib/libboost_python310-a32.so
-usr/lib/libboost_python310-a32.so.1.76.0
-#usr/lib/libboost_python310-mt-a32.so
-usr/lib/libboost_python310-mt-a32.so.1.76.0
+#usr/lib/libboost_python38-a32.so
+usr/lib/libboost_python38-a32.so.1.76.0
+#usr/lib/libboost_python38-mt-a32.so
+usr/lib/libboost_python38-mt-a32.so.1.76.0
#usr/lib/libboost_random-a32.so
usr/lib/libboost_random-a32.so.1.76.0
#usr/lib/libboost_random-mt-a32.so
diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost
index 77eef1d0b..357dc2d1d 100644
--- a/config/rootfiles/common/x86_64/boost
+++ b/config/rootfiles/common/x86_64/boost
@@ -16250,10 +16250,10 @@ usr/lib/libboost_nowide-x64.so.1.76.0
usr/lib/libboost_prg_exec_monitor-mt-x64.so.1.76.0
#usr/lib/libboost_prg_exec_monitor-x64.so
usr/lib/libboost_prg_exec_monitor-x64.so.1.76.0
-#usr/lib/libboost_python310-mt-x64.so
-usr/lib/libboost_python310-mt-x64.so.1.76.0
-#usr/lib/libboost_python310-x64.so
-usr/lib/libboost_python310-x64.so.1.76.0
+#usr/lib/libboost_python38-mt-x64.so
+usr/lib/libboost_python38-mt-x64.so.1.76.0
+#usr/lib/libboost_python38-x64.so
+usr/lib/libboost_python38-x64.so.1.76.0
#usr/lib/libboost_random-mt-x64.so
usr/lib/libboost_random-mt-x64.so.1.76.0
#usr/lib/libboost_random-x64.so
diff --git a/config/rootfiles/core/168/filelists/aarch64/boost b/config/rootfiles/core/168/filelists/aarch64/boost
deleted file mode 120000
index 807ad06be..000000000
--- a/config/rootfiles/core/168/filelists/aarch64/boost
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/aarch64/boost
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/armv6l/boost b/config/rootfiles/core/168/filelists/armv6l/boost
deleted file mode 120000
index 42aa7cd23..000000000
--- a/config/rootfiles/core/168/filelists/armv6l/boost
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv6l/boost
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/x86_64/boost b/config/rootfiles/core/168/filelists/x86_64/boost
deleted file mode 120000
index 9ed31e1d5..000000000
--- a/config/rootfiles/core/168/filelists/x86_64/boost
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/boost
\ No newline at end of file
diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh
index daebf249e..f62c3810a 100644
--- a/config/rootfiles/core/168/update.sh
+++ b/config/rootfiles/core/168/update.sh
@@ -42,7 +42,6 @@ rm -rvf \
/usr/bin/dnet-config \
/usr/bin/sdparm \
/usr/lib/libart_lgpl_2.so* \
- /usr/lib/libboost_python38* \
/usr/lib/libdnet.la \
/usr/lib/libdnet.so* \
/usr/lib/libevent-1.4.so* \
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-05 21:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-05 21:18 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 99a79bcbd89de07e108b836fe7d19bd26aeb02c3 Peter Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox