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@ipfire.org>

diff --git a/config/rootfiles/packages/aarch64/libtalloc b/config/rootfiles/packages/aarch64/libtalloc
deleted file mode 100644 (file)
index 2e8a0e6..0000000
--- 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 (file)
index 0b7e96b..0000000
--- 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 (file)
index 145a3b7..0000000
--- 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 (file)
index 0000000..ef80efc
--- /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 (file)
index 3a03933..0000000
--- 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 098290d7f3009aca666fa437cfb8d8c0efe5372e..546524be572be5c888101492a0845075bc01f0f0 100644 (file)
--- 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)