From ffd8eafa52ebf3cc478adf19bd3553edfad97289 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 6 Oct 2020 16:35:26 +0000 Subject: [PATCH] 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 --- 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 +- 6 files changed, 6 insertions(+), 57 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 diff --git a/config/rootfiles/packages/aarch64/libtalloc b/config/rootfiles/packages/aarch64/libtalloc deleted file mode 100644 index 2e8a0e6541..0000000000 --- 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 0b7e96b54c..0000000000 --- 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 145a3b7f14..0000000000 --- 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 0000000000..ef80efcea4 --- /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 3a03933c9e..0000000000 --- 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 098290d7f3..546524be57 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) -- 2.39.5