* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ffd8eafa52ebf3cc478adf19bd3553edfad97289
@ 2020-10-06 16:49 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2020-10-06 16:49 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 8719 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 ffd8eafa52ebf3cc478adf19bd3553edfad97289 (commit)
via 7bdfa67a4b6b59df6d6dca29ea8d9ee5e9a3be00 (commit)
via 5f6f2e0b7c5abe9403cda1c41837827fa73e5fa2 (commit)
from bcbcd15f64e90a077637af261bdf0f976f846c9a (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 ffd8eafa52ebf3cc478adf19bd3553edfad97289
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 6 16:35:26 2020 +0000
libtalloc: Move to /usr and drop Python module
We do not use the Python module and can therefore
only have one rootfile for all architectures.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7bdfa67a4b6b59df6d6dca29ea8d9ee5e9a3be00
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 6 16:21:09 2020 +0000
python3: Rootfile update for i586
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5f6f2e0b7c5abe9403cda1c41837827fa73e5fa2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 6 15:13:54 2020 +0000
python3: Update rootfile for armv5tel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/armv5tel/python3 | 4 ++--
config/rootfiles/common/i586/python3 | 4 ++--
config/rootfiles/packages/aarch64/libtalloc | 14 --------------
config/rootfiles/packages/armv5tel/libtalloc | 14 --------------
config/rootfiles/packages/i586/libtalloc | 14 --------------
config/rootfiles/packages/libtalloc | 5 +++++
config/rootfiles/packages/x86_64/libtalloc | 14 --------------
lfs/libtalloc | 2 +-
8 files changed, 10 insertions(+), 61 deletions(-)
delete mode 100644 config/rootfiles/packages/aarch64/libtalloc
delete mode 100644 config/rootfiles/packages/armv5tel/libtalloc
delete mode 100644 config/rootfiles/packages/i586/libtalloc
create mode 100644 config/rootfiles/packages/libtalloc
delete mode 100644 config/rootfiles/packages/x86_64/libtalloc
Difference in files:
diff --git a/config/rootfiles/common/armv5tel/python3 b/config/rootfiles/common/armv5tel/python3
index 595866748..3a7fc57cc 100644
--- a/config/rootfiles/common/armv5tel/python3
+++ b/config/rootfiles/common/armv5tel/python3
@@ -841,9 +841,9 @@ usr/lib/python3.8/lib-dynload/xxlimited.cpython-38-arm-linux-gnueabi.so
usr/lib/python3.8/lib-dynload/zlib.cpython-38-arm-linux-gnueabi.so
#usr/lib/python3.8/lib2to3
usr/lib/python3.8/lib2to3/Grammar.txt
-usr/lib/python3.8/lib2to3/Grammar3.8.1.final.0.pickle
+usr/lib/python3.8/lib2to3/Grammar3.8.2.final.0.pickle
usr/lib/python3.8/lib2to3/PatternGrammar.txt
-usr/lib/python3.8/lib2to3/PatternGrammar3.8.1.final.0.pickle
+usr/lib/python3.8/lib2to3/PatternGrammar3.8.2.final.0.pickle
usr/lib/python3.8/lib2to3/__init__.py
usr/lib/python3.8/lib2to3/__main__.py
usr/lib/python3.8/lib2to3/btm_matcher.py
diff --git a/config/rootfiles/common/i586/python3 b/config/rootfiles/common/i586/python3
index bb77414c7..78f759c4c 100644
--- a/config/rootfiles/common/i586/python3
+++ b/config/rootfiles/common/i586/python3
@@ -841,9 +841,9 @@ usr/lib/python3.8/lib-dynload/xxlimited.cpython-38-i386-linux-gnu.so
usr/lib/python3.8/lib-dynload/zlib.cpython-38-i386-linux-gnu.so
#usr/lib/python3.8/lib2to3
usr/lib/python3.8/lib2to3/Grammar.txt
-usr/lib/python3.8/lib2to3/Grammar3.8.1.final.0.pickle
+usr/lib/python3.8/lib2to3/Grammar3.8.2.final.0.pickle
usr/lib/python3.8/lib2to3/PatternGrammar.txt
-usr/lib/python3.8/lib2to3/PatternGrammar3.8.1.final.0.pickle
+usr/lib/python3.8/lib2to3/PatternGrammar3.8.2.final.0.pickle
usr/lib/python3.8/lib2to3/__init__.py
usr/lib/python3.8/lib2to3/__main__.py
usr/lib/python3.8/lib2to3/btm_matcher.py
diff --git a/config/rootfiles/packages/aarch64/libtalloc b/config/rootfiles/packages/aarch64/libtalloc
deleted file mode 100644
index 2e8a0e654..000000000
--- a/config/rootfiles/packages/aarch64/libtalloc
+++ /dev/null
@@ -1,14 +0,0 @@
-#usr/local/include/pytalloc.h
-#usr/local/include/talloc.h
-#usr/local/lib/libpytalloc-util.cpython-38-aarch64-linux-gnu.so
-#usr/local/lib/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2
-#usr/local/lib/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.1
-usr/local/lib/libtalloc.so
-usr/local/lib/libtalloc.so.2
-usr/local/lib/libtalloc.so.2.3.1
-#usr/local/lib/pkgconfig
-#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-aarch64-linux-gnu.pc
-#usr/local/lib/pkgconfig/talloc.pc
-#usr/local/lib/python3.8
-#usr/local/lib/python3.8/site-packages
-#usr/local/lib/python3.8/site-packages/talloc.cpython-38-aarch64-linux-gnu.so
diff --git a/config/rootfiles/packages/armv5tel/libtalloc b/config/rootfiles/packages/armv5tel/libtalloc
deleted file mode 100644
index 0b7e96b54..000000000
--- a/config/rootfiles/packages/armv5tel/libtalloc
+++ /dev/null
@@ -1,14 +0,0 @@
-#usr/local/include/pytalloc.h
-#usr/local/include/talloc.h
-#usr/local/lib/libpytalloc-util.cpython-38-arm-linux-gnu.so
-#usr/local/lib/libpytalloc-util.cpython-38-arm-linux-gnu.so.2
-#usr/local/lib/libpytalloc-util.cpython-38-arm-linux-gnu.so.2.3.1
-usr/local/lib/libtalloc.so
-usr/local/lib/libtalloc.so.2
-usr/local/lib/libtalloc.so.2.3.1
-#usr/local/lib/pkgconfig
-#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-arm-linux-gnu.pc
-#usr/local/lib/pkgconfig/talloc.pc
-#usr/local/lib/python3.8
-#usr/local/lib/python3.8/site-packages
-#usr/local/lib/python3.8/site-packages/talloc.cpython-38-arm-linux-gnu.so
diff --git a/config/rootfiles/packages/i586/libtalloc b/config/rootfiles/packages/i586/libtalloc
deleted file mode 100644
index 145a3b7f1..000000000
--- a/config/rootfiles/packages/i586/libtalloc
+++ /dev/null
@@ -1,14 +0,0 @@
-#usr/local/include/pytalloc.h
-#usr/local/include/talloc.h
-#usr/local/lib/libpytalloc-util.cpython-38-i386-linux-gnu.so
-#usr/local/lib/libpytalloc-util.cpython-38-i386-linux-gnu.so.2
-#usr/local/lib/libpytalloc-util.cpython-38-i386-linux-gnu.so.2.3.1
-usr/local/lib/libtalloc.so
-usr/local/lib/libtalloc.so.2
-usr/local/lib/libtalloc.so.2.3.1
-#usr/local/lib/pkgconfig
-#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-i386-linux-gnu.pc
-#usr/local/lib/pkgconfig/talloc.pc
-#usr/local/lib/python3.8
-#usr/local/lib/python3.8/site-packages
-#usr/local/lib/python3.8/site-packages/talloc.cpython-38-i386-linux-gnu.so
diff --git a/config/rootfiles/packages/libtalloc b/config/rootfiles/packages/libtalloc
new file mode 100644
index 000000000..ef80efcea
--- /dev/null
+++ b/config/rootfiles/packages/libtalloc
@@ -0,0 +1,5 @@
+#usr/include/talloc.h
+#usr/lib/libtalloc.so
+usr/lib/libtalloc.so.2
+usr/lib/libtalloc.so.2.3.1
+#usr/lib/pkgconfig/talloc.pc
diff --git a/config/rootfiles/packages/x86_64/libtalloc b/config/rootfiles/packages/x86_64/libtalloc
deleted file mode 100644
index 3a03933c9..000000000
--- a/config/rootfiles/packages/x86_64/libtalloc
+++ /dev/null
@@ -1,14 +0,0 @@
-#usr/local/include/pytalloc.h
-#usr/local/include/talloc.h
-#usr/local/lib/libpytalloc-util.cpython-38-x86_64-linux-gnu.so
-#usr/local/lib/libpytalloc-util.cpython-38-x86_64-linux-gnu.so.2
-#usr/local/lib/libpytalloc-util.cpython-38-x86_64-linux-gnu.so.2.3.1
-usr/local/lib/libtalloc.so
-usr/local/lib/libtalloc.so.2
-usr/local/lib/libtalloc.so.2.3.1
-#usr/local/lib/pkgconfig
-#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-x86_64-linux-gnu.pc
-#usr/local/lib/pkgconfig/talloc.pc
-#usr/local/lib/python3.8
-#usr/local/lib/python3.8/site-packages
-#usr/local/lib/python3.8/site-packages/talloc.cpython-38-x86_64-linux-gnu.so
diff --git a/lfs/libtalloc b/lfs/libtalloc
index 098290d7f..546524be5 100644
--- a/lfs/libtalloc
+++ b/lfs/libtalloc
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure
+ cd $(DIR_APP) && ./configure --prefix=/usr --disable-python
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-10-06 16:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-06 16:49 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ffd8eafa52ebf3cc478adf19bd3553edfad97289 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox