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 5ecf056d52b007a413db0477254a3600fef1d81c (commit) from b2f707cb025bccf4417b0848e1140fc610e76fd6 (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 5ecf056d52b007a413db0477254a3600fef1d81c Author: Peter Müller peter.mueller@ipfire.org Date: Thu May 5 16:47:44 2022 +0000

Drop libusb-compat

This was solely needed for NUT, which has now been updated, and does not require an older libusb version to be carried around.

Signed-off-by: Peter Müller peter.mueller@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/libusb-compat | 7 ---- config/rootfiles/core/168/update.sh | 2 + lfs/libusb-compat | 78 ----------------------------------- make.sh | 1 - 4 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 config/rootfiles/common/libusb-compat delete mode 100644 lfs/libusb-compat

Difference in files: diff --git a/config/rootfiles/common/libusb-compat b/config/rootfiles/common/libusb-compat deleted file mode 100644 index ca3007e9b..000000000 --- a/config/rootfiles/common/libusb-compat +++ /dev/null @@ -1,7 +0,0 @@ -#usr/bin/libusb-config -#usr/include/usb.h -usr/lib/libusb-0.1.so.4 -usr/lib/libusb-0.1.so.4.4.4 -#usr/lib/libusb.la -usr/lib/libusb.so -#usr/lib/pkgconfig/libusb.pc diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh index 4b525170b..daebf249e 100644 --- a/config/rootfiles/core/168/update.sh +++ b/config/rootfiles/core/168/update.sh @@ -53,6 +53,8 @@ rm -rvf \ /usr/lib/libpri.so* \ /usr/lib/libsolv.so* \ /usr/lib/libsolvext.so* \ + /usr/lib/libusb.so \ + /usr/lib/libusb-0.1.so* \ /usr/sbin/dnet

# Remove netbpm add-on, if installed diff --git a/lfs/libusb-compat b/lfs/libusb-compat deleted file mode 100644 index f82d36c5a..000000000 --- a/lfs/libusb-compat +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.1.5 - -THISAPP = libusb-compat-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-static - cd $(DIR_APP) && make -j $(PARALLELISM) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index d96d4db2a..09b307e36 100755 --- a/make.sh +++ b/make.sh @@ -1156,7 +1156,6 @@ buildipfire() { lfsmake2 popt lfsmake2 libedit lfsmake2 libusb - lfsmake2 libusb-compat lfsmake2 libpcap lfsmake2 ppp lfsmake2 pptp

hooks/post-receive -- IPFire 2.x development tree