Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/libart | 53 ----------------------- lfs/libart | 78 ---------------------------------- make.sh | 1 - 3 files changed, 132 deletions(-) delete mode 100644 config/rootfiles/common/libart delete mode 100644 lfs/libart
diff --git a/config/rootfiles/common/libart b/config/rootfiles/common/libart deleted file mode 100644 index 7e98a600d..000000000 --- a/config/rootfiles/common/libart +++ /dev/null @@ -1,53 +0,0 @@ -#usr/bin/libart2-config -#usr/include/libart-2.0 -#usr/include/libart-2.0/libart_lgpl -#usr/include/libart-2.0/libart_lgpl/art_affine.h -#usr/include/libart-2.0/libart_lgpl/art_alphagamma.h -#usr/include/libart-2.0/libart_lgpl/art_bpath.h -#usr/include/libart-2.0/libart_lgpl/art_config.h -#usr/include/libart-2.0/libart_lgpl/art_filterlevel.h -#usr/include/libart-2.0/libart_lgpl/art_gray_svp.h -#usr/include/libart-2.0/libart_lgpl/art_misc.h -#usr/include/libart-2.0/libart_lgpl/art_pathcode.h -#usr/include/libart-2.0/libart_lgpl/art_pixbuf.h -#usr/include/libart-2.0/libart_lgpl/art_point.h -#usr/include/libart-2.0/libart_lgpl/art_rect.h -#usr/include/libart-2.0/libart_lgpl/art_rect_svp.h -#usr/include/libart-2.0/libart_lgpl/art_rect_uta.h -#usr/include/libart-2.0/libart_lgpl/art_render.h -#usr/include/libart-2.0/libart_lgpl/art_render_gradient.h -#usr/include/libart-2.0/libart_lgpl/art_render_mask.h -#usr/include/libart-2.0/libart_lgpl/art_render_svp.h -#usr/include/libart-2.0/libart_lgpl/art_rgb.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_a_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_svp.h -#usr/include/libart-2.0/libart_lgpl/art_rgba.h -#usr/include/libart-2.0/libart_lgpl/art_svp.h -#usr/include/libart-2.0/libart_lgpl/art_svp_intersect.h -#usr/include/libart-2.0/libart_lgpl/art_svp_ops.h -#usr/include/libart-2.0/libart_lgpl/art_svp_point.h -#usr/include/libart-2.0/libart_lgpl/art_svp_render_aa.h -#usr/include/libart-2.0/libart_lgpl/art_svp_vpath.h -#usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h -#usr/include/libart-2.0/libart_lgpl/art_svp_wind.h -#usr/include/libart-2.0/libart_lgpl/art_uta.h -#usr/include/libart-2.0/libart_lgpl/art_uta_ops.h -#usr/include/libart-2.0/libart_lgpl/art_uta_rect.h -#usr/include/libart-2.0/libart_lgpl/art_uta_svp.h -#usr/include/libart-2.0/libart_lgpl/art_uta_vpath.h -#usr/include/libart-2.0/libart_lgpl/art_vpath.h -#usr/include/libart-2.0/libart_lgpl/art_vpath_bpath.h -#usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h -#usr/include/libart-2.0/libart_lgpl/art_vpath_svp.h -#usr/include/libart-2.0/libart_lgpl/libart-features.h -#usr/include/libart-2.0/libart_lgpl/libart.h -#usr/lib/libart_lgpl_2.a -#usr/lib/libart_lgpl_2.la -usr/lib/libart_lgpl_2.so -usr/lib/libart_lgpl_2.so.2 -usr/lib/libart_lgpl_2.so.2.3.21 -#usr/lib/pkgconfig/libart-2.0.pc diff --git a/lfs/libart b/lfs/libart deleted file mode 100644 index b5f463683..000000000 --- a/lfs/libart +++ /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 = 2.3.21 - -THISAPP = libart_lgpl-$(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 = 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b - -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 - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 95e6e89db..21d385d78 100755 --- a/make.sh +++ b/make.sh @@ -1331,7 +1331,6 @@ buildipfire() { lfsmake2 libexif lfsmake2 libpng lfsmake2 libtiff - lfsmake2 libart lfsmake2 gd lfsmake2 slang lfsmake2 newt
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/libdnet | 26 ----------- lfs/libdnet | 80 --------------------------------- make.sh | 1 - 3 files changed, 107 deletions(-) delete mode 100644 config/rootfiles/common/libdnet delete mode 100644 lfs/libdnet
diff --git a/config/rootfiles/common/libdnet b/config/rootfiles/common/libdnet deleted file mode 100644 index 26288de23..000000000 --- a/config/rootfiles/common/libdnet +++ /dev/null @@ -1,26 +0,0 @@ -usr/bin/dnet-config -#usr/include/dnet -#usr/include/dnet.h -#usr/include/dnet/addr.h -#usr/include/dnet/arp.h -#usr/include/dnet/blob.h -#usr/include/dnet/eth.h -#usr/include/dnet/fw.h -#usr/include/dnet/icmp.h -#usr/include/dnet/intf.h -#usr/include/dnet/ip.h -#usr/include/dnet/ip6.h -#usr/include/dnet/os.h -#usr/include/dnet/rand.h -#usr/include/dnet/route.h -#usr/include/dnet/sctp.h -#usr/include/dnet/tcp.h -#usr/include/dnet/tun.h -#usr/include/dnet/udp.h -usr/lib/libdnet.la -#usr/lib/libdnet.so -usr/lib/libdnet.so.1 -usr/lib/libdnet.so.1.0.1 -#usr/man/man3/dnet.3 -#usr/man/man8/dnet.8 -usr/sbin/dnet diff --git a/lfs/libdnet b/lfs/libdnet deleted file mode 100644 index 073685791..000000000 --- a/lfs/libdnet +++ /dev/null @@ -1,80 +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 = 1.14 - -THISAPP = libdnet-libdnet-$(VER) -DL_FILE = $(THISAPP).tar.gz -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 = 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a - -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 zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --disable-static - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 21d385d78..207515e56 100755 --- a/make.sh +++ b/make.sh @@ -1438,7 +1438,6 @@ buildipfire() { lfsmake2 pango lfsmake2 rrdtool lfsmake2 setup - lfsmake2 libdnet lfsmake2 jansson lfsmake2 yaml lfsmake2 libhtp
Acked-by: Michael Tremer michael.tremer@ipfire.org
On 7 Apr 2022, at 12:04, Adolf Belka adolf.belka@ipfire.org wrote:
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/libdnet | 26 ----------- lfs/libdnet | 80 --------------------------------- make.sh | 1 - 3 files changed, 107 deletions(-) delete mode 100644 config/rootfiles/common/libdnet delete mode 100644 lfs/libdnet
diff --git a/config/rootfiles/common/libdnet b/config/rootfiles/common/libdnet deleted file mode 100644 index 26288de23..000000000 --- a/config/rootfiles/common/libdnet +++ /dev/null @@ -1,26 +0,0 @@ -usr/bin/dnet-config -#usr/include/dnet -#usr/include/dnet.h -#usr/include/dnet/addr.h -#usr/include/dnet/arp.h -#usr/include/dnet/blob.h -#usr/include/dnet/eth.h -#usr/include/dnet/fw.h -#usr/include/dnet/icmp.h -#usr/include/dnet/intf.h -#usr/include/dnet/ip.h -#usr/include/dnet/ip6.h -#usr/include/dnet/os.h -#usr/include/dnet/rand.h -#usr/include/dnet/route.h -#usr/include/dnet/sctp.h -#usr/include/dnet/tcp.h -#usr/include/dnet/tun.h -#usr/include/dnet/udp.h -usr/lib/libdnet.la -#usr/lib/libdnet.so -usr/lib/libdnet.so.1 -usr/lib/libdnet.so.1.0.1 -#usr/man/man3/dnet.3 -#usr/man/man8/dnet.8 -usr/sbin/dnet diff --git a/lfs/libdnet b/lfs/libdnet deleted file mode 100644 index 073685791..000000000 --- a/lfs/libdnet +++ /dev/null @@ -1,80 +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 = 1.14
-THISAPP = libdnet-libdnet-$(VER) -DL_FILE = $(THISAPP).tar.gz -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 = 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a
-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 zxf $(DIR_DL)/$(DL_FILE)
- $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure \
--prefix=/usr \
--disable-static
- cd $(DIR_APP) && make
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh index 21d385d78..207515e56 100755 --- a/make.sh +++ b/make.sh @@ -1438,7 +1438,6 @@ buildipfire() { lfsmake2 pango lfsmake2 rrdtool lfsmake2 setup
- lfsmake2 libdnet lfsmake2 jansson lfsmake2 yaml lfsmake2 libhtp
-- 2.35.1
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/packages/libpri | 4 -- lfs/libpri | 88 -------------------------------- make.sh | 1 - 3 files changed, 93 deletions(-) delete mode 100644 config/rootfiles/packages/libpri delete mode 100644 lfs/libpri
diff --git a/config/rootfiles/packages/libpri b/config/rootfiles/packages/libpri deleted file mode 100644 index 19fd87485..000000000 --- a/config/rootfiles/packages/libpri +++ /dev/null @@ -1,4 +0,0 @@ -#usr/include/libpri.h -#usr/lib/libpri.a -usr/lib/libpri.so -usr/lib/libpri.so.1.4 diff --git a/lfs/libpri b/lfs/libpri deleted file mode 100644 index 3236bbff8..000000000 --- a/lfs/libpri +++ /dev/null @@ -1,88 +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 - -SUMMARY = An implementation of Primary Rate ISDN - -VER = 1.4.10.2 - -THISAPP = libpri-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libpri -PAK_VER = 2 - -DEPS = - -SERVICES = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 62f642ced45c969bf1bc3117110b35e891497de7414da11f622de868188b4b0558194cb39f4bb8941e6229fba1974a4905163f1df92f6f3c25411cf9cfa9b22f - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - $(PAK) - -############################################################################### -# 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 zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER) \ - CFLAGS="$(CFLAGS)" - cd $(DIR_APP) && make install KVERS=$(KVER) - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 207515e56..83d6a9d08 100755 --- a/make.sh +++ b/make.sh @@ -1590,7 +1590,6 @@ buildipfire() { lfsmake2 monit lfsmake2 nut lfsmake2 watchdog - lfsmake2 libpri lfsmake2 usb_modeswitch lfsmake2 usb_modeswitch_data lfsmake2 zerofree
Acked-by: Michael Tremer michael.tremer@ipfire.org
On 7 Apr 2022, at 12:04, Adolf Belka adolf.belka@ipfire.org wrote:
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/packages/libpri | 4 -- lfs/libpri | 88 -------------------------------- make.sh | 1 - 3 files changed, 93 deletions(-) delete mode 100644 config/rootfiles/packages/libpri delete mode 100644 lfs/libpri
diff --git a/config/rootfiles/packages/libpri b/config/rootfiles/packages/libpri deleted file mode 100644 index 19fd87485..000000000 --- a/config/rootfiles/packages/libpri +++ /dev/null @@ -1,4 +0,0 @@ -#usr/include/libpri.h -#usr/lib/libpri.a -usr/lib/libpri.so -usr/lib/libpri.so.1.4 diff --git a/lfs/libpri b/lfs/libpri deleted file mode 100644 index 3236bbff8..000000000 --- a/lfs/libpri +++ /dev/null @@ -1,88 +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
-SUMMARY = An implementation of Primary Rate ISDN
-VER = 1.4.10.2
-THISAPP = libpri-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libpri -PAK_VER = 2
-DEPS =
-SERVICES =
-############################################################################### -# Top-level Rules -###############################################################################
-objects = $(DL_FILE)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 62f642ced45c969bf1bc3117110b35e891497de7414da11f622de868188b4b0558194cb39f4bb8941e6229fba1974a4905163f1df92f6f3c25411cf9cfa9b22f
-install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-b2 : $(subst %,%_BLAKE2,$(objects))
-dist:
- $(PAK)
-############################################################################### -# 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 zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER) \
CFLAGS="$(CFLAGS)"
- cd $(DIR_APP) && make install KVERS=$(KVER)
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh index 207515e56..83d6a9d08 100755 --- a/make.sh +++ b/make.sh @@ -1590,7 +1590,6 @@ buildipfire() { lfsmake2 monit lfsmake2 nut lfsmake2 watchdog
- lfsmake2 libpri lfsmake2 usb_modeswitch lfsmake2 usb_modeswitch_data lfsmake2 zerofree
-- 2.35.1
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/packages/libsolv | 52 --------------- lfs/libsolv | 104 ------------------------------ make.sh | 1 - 3 files changed, 157 deletions(-) delete mode 100644 config/rootfiles/packages/libsolv delete mode 100644 lfs/libsolv
diff --git a/config/rootfiles/packages/libsolv b/config/rootfiles/packages/libsolv deleted file mode 100644 index 8a9c1a246..000000000 --- a/config/rootfiles/packages/libsolv +++ /dev/null @@ -1,52 +0,0 @@ -#usr/include/solv -#usr/include/solv/bitmap.h -#usr/include/solv/chksum.h -#usr/include/solv/dataiterator.h -#usr/include/solv/dirpool.h -#usr/include/solv/evr.h -#usr/include/solv/hash.h -#usr/include/solv/knownid.h -#usr/include/solv/policy.h -#usr/include/solv/pool.h -#usr/include/solv/poolarch.h -#usr/include/solv/poolid.h -#usr/include/solv/pooltypes.h -#usr/include/solv/poolvendor.h -#usr/include/solv/problems.h -#usr/include/solv/queue.h -#usr/include/solv/repo.h -#usr/include/solv/repo_solv.h -#usr/include/solv/repo_write.h -#usr/include/solv/repodata.h -#usr/include/solv/rules.h -#usr/include/solv/selection.h -#usr/include/solv/solv_xfopen.h -#usr/include/solv/solvable.h -#usr/include/solv/solver.h -#usr/include/solv/solverdebug.h -#usr/include/solv/solvversion.h -#usr/include/solv/strpool.h -#usr/include/solv/testcase.h -#usr/include/solv/tools_util.h -#usr/include/solv/transaction.h -#usr/include/solv/util.h -#usr/lib/libsolv.so -usr/lib/libsolv.so.1 -#usr/lib/libsolvext.so -usr/lib/libsolvext.so.1 -#usr/lib/pkgconfig/libsolv.pc -#usr/lib/pkgconfig/libsolvext.pc -#usr/share/cmake -#usr/share/cmake/Modules -#usr/share/cmake/Modules/FindLibSolv.cmake -#usr/share/man/man1/dumpsolv.1 -#usr/share/man/man1/installcheck.1 -#usr/share/man/man1/mergesolv.1 -#usr/share/man/man1/repo2solv.1 -#usr/share/man/man1/solv.1 -#usr/share/man/man1/testsolv.1 -#usr/share/man/man3/libsolv-bindings.3 -#usr/share/man/man3/libsolv-constantids.3 -#usr/share/man/man3/libsolv-history.3 -#usr/share/man/man3/libsolv-pool.3 -#usr/share/man/man3/libsolv.3 diff --git a/lfs/libsolv b/lfs/libsolv deleted file mode 100644 index d6efc6488..000000000 --- a/lfs/libsolv +++ /dev/null @@ -1,104 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 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 - -SUMMARY = Package dependency solver using a satisfiability algorithm - -VER = 0.7.19 - -THISAPP = libsolv-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -PROG = libsolv -DEPS = -PAK_VER = 4 - -SERVICES = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 32fa800eb3d6ff764499816af9cff3c11210e3845ed28902ee3c2865b4842df1db2a659e1453ac1f7541e6188e264e943b8271465bef0a78a3a982a112b0c58c - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist : - @$(PAK) - -############################################################################### -# 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 zxf $(DIR_DL)/$(DL_FILE) - - # Who releases code with -Werror? - cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt - - # Disable bindings, examples and tools. - cd $(DIR_APP) && sed "/bindings/d" -i CMakeLists.txt - cd $(DIR_APP) && sed "/examples/d" -i CMakeLists.txt - cd $(DIR_APP) && sed "/tools/d" -i CMakeLists.txt - - cd $(DIR_APP) && mkdir build - cd $(DIR_APP)/build && cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 \ - -DENABLE_PERL=0 \ - -DENABLE_PYTHON=0 \ - -DENABLE_RUBY=0 - cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) - cd $(DIR_APP)/build && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 83d6a9d08..79f563eff 100755 --- a/make.sh +++ b/make.sh @@ -1602,7 +1602,6 @@ buildipfire() { lfsmake2 u-boot lfsmake2 u-boot-friendlyarm lfsmake2 wireless-regdb - lfsmake2 libsolv lfsmake2 ddns lfsmake2 python3-pycparser lfsmake2 python3-charset-normalizer
Acked-by: Michael Tremer michael.tremer@ipfire.org
On 7 Apr 2022, at 12:04, Adolf Belka adolf.belka@ipfire.org wrote:
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/packages/libsolv | 52 --------------- lfs/libsolv | 104 ------------------------------ make.sh | 1 - 3 files changed, 157 deletions(-) delete mode 100644 config/rootfiles/packages/libsolv delete mode 100644 lfs/libsolv
diff --git a/config/rootfiles/packages/libsolv b/config/rootfiles/packages/libsolv deleted file mode 100644 index 8a9c1a246..000000000 --- a/config/rootfiles/packages/libsolv +++ /dev/null @@ -1,52 +0,0 @@ -#usr/include/solv -#usr/include/solv/bitmap.h -#usr/include/solv/chksum.h -#usr/include/solv/dataiterator.h -#usr/include/solv/dirpool.h -#usr/include/solv/evr.h -#usr/include/solv/hash.h -#usr/include/solv/knownid.h -#usr/include/solv/policy.h -#usr/include/solv/pool.h -#usr/include/solv/poolarch.h -#usr/include/solv/poolid.h -#usr/include/solv/pooltypes.h -#usr/include/solv/poolvendor.h -#usr/include/solv/problems.h -#usr/include/solv/queue.h -#usr/include/solv/repo.h -#usr/include/solv/repo_solv.h -#usr/include/solv/repo_write.h -#usr/include/solv/repodata.h -#usr/include/solv/rules.h -#usr/include/solv/selection.h -#usr/include/solv/solv_xfopen.h -#usr/include/solv/solvable.h -#usr/include/solv/solver.h -#usr/include/solv/solverdebug.h -#usr/include/solv/solvversion.h -#usr/include/solv/strpool.h -#usr/include/solv/testcase.h -#usr/include/solv/tools_util.h -#usr/include/solv/transaction.h -#usr/include/solv/util.h -#usr/lib/libsolv.so -usr/lib/libsolv.so.1 -#usr/lib/libsolvext.so -usr/lib/libsolvext.so.1 -#usr/lib/pkgconfig/libsolv.pc -#usr/lib/pkgconfig/libsolvext.pc -#usr/share/cmake -#usr/share/cmake/Modules -#usr/share/cmake/Modules/FindLibSolv.cmake -#usr/share/man/man1/dumpsolv.1 -#usr/share/man/man1/installcheck.1 -#usr/share/man/man1/mergesolv.1 -#usr/share/man/man1/repo2solv.1 -#usr/share/man/man1/solv.1 -#usr/share/man/man1/testsolv.1 -#usr/share/man/man3/libsolv-bindings.3 -#usr/share/man/man3/libsolv-constantids.3 -#usr/share/man/man3/libsolv-history.3 -#usr/share/man/man3/libsolv-pool.3 -#usr/share/man/man3/libsolv.3 diff --git a/lfs/libsolv b/lfs/libsolv deleted file mode 100644 index d6efc6488..000000000 --- a/lfs/libsolv +++ /dev/null @@ -1,104 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 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
-SUMMARY = Package dependency solver using a satisfiability algorithm
-VER = 0.7.19
-THISAPP = libsolv-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = libsolv -DEPS = -PAK_VER = 4
-SERVICES =
-############################################################################### -# Top-level Rules -###############################################################################
-objects = $(DL_FILE)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 32fa800eb3d6ff764499816af9cff3c11210e3845ed28902ee3c2865b4842df1db2a659e1453ac1f7541e6188e264e943b8271465bef0a78a3a982a112b0c58c
-install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-b2 : $(subst %,%_BLAKE2,$(objects))
-dist :
- @$(PAK)
-############################################################################### -# 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 zxf $(DIR_DL)/$(DL_FILE)
- # Who releases code with -Werror?
- cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt
- # Disable bindings, examples and tools.
- cd $(DIR_APP) && sed "/bindings/d" -i CMakeLists.txt
- cd $(DIR_APP) && sed "/examples/d" -i CMakeLists.txt
- cd $(DIR_APP) && sed "/tools/d" -i CMakeLists.txt
- cd $(DIR_APP) && mkdir build
- cd $(DIR_APP)/build && cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=1 \
-DENABLE_PERL=0 \
-DENABLE_PYTHON=0 \
-DENABLE_RUBY=0
- cd $(DIR_APP)/build && make $(PARALELLISMFLAGS)
- cd $(DIR_APP)/build && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh index 83d6a9d08..79f563eff 100755 --- a/make.sh +++ b/make.sh @@ -1602,7 +1602,6 @@ buildipfire() { lfsmake2 u-boot lfsmake2 u-boot-friendlyarm lfsmake2 wireless-regdb
- lfsmake2 libsolv lfsmake2 ddns lfsmake2 python3-pycparser lfsmake2 python3-charset-normalizer
-- 2.35.1
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/pigz | 2 - lfs/pigz | 80 ------------------------------------ make.sh | 1 - 3 files changed, 83 deletions(-) delete mode 100644 config/rootfiles/common/pigz delete mode 100644 lfs/pigz
diff --git a/config/rootfiles/common/pigz b/config/rootfiles/common/pigz deleted file mode 100644 index 618d92464..000000000 --- a/config/rootfiles/common/pigz +++ /dev/null @@ -1,2 +0,0 @@ -#usr/bin/pigz -#usr/bin/unpigz diff --git a/lfs/pigz b/lfs/pigz deleted file mode 100644 index 7fe9177ef..000000000 --- a/lfs/pigz +++ /dev/null @@ -1,80 +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 = 2.6 - -THISAPP = pigz-$(VER) -DL_FILE = $(THISAPP).tar.gz -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 = 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING) - cd $(DIR_APP) && install -m 755 pigz /usr/bin/pigz - ln -svf pigz /usr/bin/unpigz - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 79f563eff..7c820f463 100755 --- a/make.sh +++ b/make.sh @@ -1673,7 +1673,6 @@ buildipfire() { lfsmake2 perl-IO-String lfsmake2 perl-PDF-API2 lfsmake2 proxy-accounting - lfsmake2 pigz lfsmake2 tmux lfsmake2 perl-Text-CSV_XS lfsmake2 lua
Acked-by: Michael Tremer michael.tremer@ipfire.org
On 7 Apr 2022, at 12:04, Adolf Belka adolf.belka@ipfire.org wrote:
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/pigz | 2 - lfs/pigz | 80 ------------------------------------ make.sh | 1 - 3 files changed, 83 deletions(-) delete mode 100644 config/rootfiles/common/pigz delete mode 100644 lfs/pigz
diff --git a/config/rootfiles/common/pigz b/config/rootfiles/common/pigz deleted file mode 100644 index 618d92464..000000000 --- a/config/rootfiles/common/pigz +++ /dev/null @@ -1,2 +0,0 @@ -#usr/bin/pigz -#usr/bin/unpigz diff --git a/lfs/pigz b/lfs/pigz deleted file mode 100644 index 7fe9177ef..000000000 --- a/lfs/pigz +++ /dev/null @@ -1,80 +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 = 2.6
-THISAPP = pigz-$(VER) -DL_FILE = $(THISAPP).tar.gz -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 = 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba
-install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-b2 : $(subst %,%_BLAKE2,$(objects))
-dist:
- @$(PAK)
-############################################################################### -# 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 axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING)
- cd $(DIR_APP) && install -m 755 pigz /usr/bin/pigz
- ln -svf pigz /usr/bin/unpigz
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh index 79f563eff..7c820f463 100755 --- a/make.sh +++ b/make.sh @@ -1673,7 +1673,6 @@ buildipfire() { lfsmake2 perl-IO-String lfsmake2 perl-PDF-API2 lfsmake2 proxy-accounting
- lfsmake2 pigz lfsmake2 tmux lfsmake2 perl-Text-CSV_XS lfsmake2 lua
-- 2.35.1
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/sdparm | 6 --- lfs/sdparm | 81 ---------------------------------- make.sh | 1 - 3 files changed, 88 deletions(-) delete mode 100644 config/rootfiles/common/sdparm delete mode 100644 lfs/sdparm
diff --git a/config/rootfiles/common/sdparm b/config/rootfiles/common/sdparm deleted file mode 100644 index 439c42965..000000000 --- a/config/rootfiles/common/sdparm +++ /dev/null @@ -1,6 +0,0 @@ -#usr/bin/sas_disk_blink -#usr/bin/scsi_ch_swp -usr/bin/sdparm -#usr/share/man/man8/sas_disk_blink.8 -#usr/share/man/man8/scsi_ch_swp.8 -#usr/share/man/man8/sdparm.8 diff --git a/lfs/sdparm b/lfs/sdparm deleted file mode 100644 index d77542db0..000000000 --- a/lfs/sdparm +++ /dev/null @@ -1,81 +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 = 1.12 - -THISAPP = sdparm-$(VER) -DL_FILE = $(THISAPP).tgz -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 = 8c872967f859763c5d8fc9e086175010c474e2332e82d79da76bfec636e90cbf54256f0b3c046db159e69b0d1ee64595757177901c48db66d2ea77ad53d623d6 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 7c820f463..bf953e82d 100755 --- a/make.sh +++ b/make.sh @@ -1378,7 +1378,6 @@ buildipfire() { lfsmake2 perl-HTTP-Date lfsmake2 gnupg lfsmake2 hdparm - lfsmake2 sdparm lfsmake2 whatmask lfsmake2 libtirpc lfsmake2 conntrack-tools
Acked-by: Michael Tremer michael.tremer@ipfire.org
On 7 Apr 2022, at 12:04, Adolf Belka adolf.belka@ipfire.org wrote:
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/sdparm | 6 --- lfs/sdparm | 81 ---------------------------------- make.sh | 1 - 3 files changed, 88 deletions(-) delete mode 100644 config/rootfiles/common/sdparm delete mode 100644 lfs/sdparm
diff --git a/config/rootfiles/common/sdparm b/config/rootfiles/common/sdparm deleted file mode 100644 index 439c42965..000000000 --- a/config/rootfiles/common/sdparm +++ /dev/null @@ -1,6 +0,0 @@ -#usr/bin/sas_disk_blink -#usr/bin/scsi_ch_swp -usr/bin/sdparm -#usr/share/man/man8/sas_disk_blink.8 -#usr/share/man/man8/scsi_ch_swp.8 -#usr/share/man/man8/sdparm.8 diff --git a/lfs/sdparm b/lfs/sdparm deleted file mode 100644 index d77542db0..000000000 --- a/lfs/sdparm +++ /dev/null @@ -1,81 +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 = 1.12
-THISAPP = sdparm-$(VER) -DL_FILE = $(THISAPP).tgz -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 = 8c872967f859763c5d8fc9e086175010c474e2332e82d79da76bfec636e90cbf54256f0b3c046db159e69b0d1ee64595757177901c48db66d2ea77ad53d623d6
-install : $(TARGET)
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-b2 : $(subst %,%_BLAKE2,$(objects))
-dist:
- @$(PAK)
-############################################################################### -# 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 zxf $(DIR_DL)/$(DL_FILE)
- $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh index 7c820f463..bf953e82d 100755 --- a/make.sh +++ b/make.sh @@ -1378,7 +1378,6 @@ buildipfire() { lfsmake2 perl-HTTP-Date lfsmake2 gnupg lfsmake2 hdparm
- lfsmake2 sdparm lfsmake2 whatmask lfsmake2 libtirpc lfsmake2 conntrack-tools
-- 2.35.1
Acked-by: Michael Tremer michael.tremer@ipfire.org
On 7 Apr 2022, at 12:04, Adolf Belka adolf.belka@ipfire.org wrote:
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/libart | 53 ----------------------- lfs/libart | 78 ---------------------------------- make.sh | 1 - 3 files changed, 132 deletions(-) delete mode 100644 config/rootfiles/common/libart delete mode 100644 lfs/libart
diff --git a/config/rootfiles/common/libart b/config/rootfiles/common/libart deleted file mode 100644 index 7e98a600d..000000000 --- a/config/rootfiles/common/libart +++ /dev/null @@ -1,53 +0,0 @@ -#usr/bin/libart2-config -#usr/include/libart-2.0 -#usr/include/libart-2.0/libart_lgpl -#usr/include/libart-2.0/libart_lgpl/art_affine.h -#usr/include/libart-2.0/libart_lgpl/art_alphagamma.h -#usr/include/libart-2.0/libart_lgpl/art_bpath.h -#usr/include/libart-2.0/libart_lgpl/art_config.h -#usr/include/libart-2.0/libart_lgpl/art_filterlevel.h -#usr/include/libart-2.0/libart_lgpl/art_gray_svp.h -#usr/include/libart-2.0/libart_lgpl/art_misc.h -#usr/include/libart-2.0/libart_lgpl/art_pathcode.h -#usr/include/libart-2.0/libart_lgpl/art_pixbuf.h -#usr/include/libart-2.0/libart_lgpl/art_point.h -#usr/include/libart-2.0/libart_lgpl/art_rect.h -#usr/include/libart-2.0/libart_lgpl/art_rect_svp.h -#usr/include/libart-2.0/libart_lgpl/art_rect_uta.h -#usr/include/libart-2.0/libart_lgpl/art_render.h -#usr/include/libart-2.0/libart_lgpl/art_render_gradient.h -#usr/include/libart-2.0/libart_lgpl/art_render_mask.h -#usr/include/libart-2.0/libart_lgpl/art_render_svp.h -#usr/include/libart-2.0/libart_lgpl/art_rgb.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_a_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h -#usr/include/libart-2.0/libart_lgpl/art_rgb_svp.h -#usr/include/libart-2.0/libart_lgpl/art_rgba.h -#usr/include/libart-2.0/libart_lgpl/art_svp.h -#usr/include/libart-2.0/libart_lgpl/art_svp_intersect.h -#usr/include/libart-2.0/libart_lgpl/art_svp_ops.h -#usr/include/libart-2.0/libart_lgpl/art_svp_point.h -#usr/include/libart-2.0/libart_lgpl/art_svp_render_aa.h -#usr/include/libart-2.0/libart_lgpl/art_svp_vpath.h -#usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h -#usr/include/libart-2.0/libart_lgpl/art_svp_wind.h -#usr/include/libart-2.0/libart_lgpl/art_uta.h -#usr/include/libart-2.0/libart_lgpl/art_uta_ops.h -#usr/include/libart-2.0/libart_lgpl/art_uta_rect.h -#usr/include/libart-2.0/libart_lgpl/art_uta_svp.h -#usr/include/libart-2.0/libart_lgpl/art_uta_vpath.h -#usr/include/libart-2.0/libart_lgpl/art_vpath.h -#usr/include/libart-2.0/libart_lgpl/art_vpath_bpath.h -#usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h -#usr/include/libart-2.0/libart_lgpl/art_vpath_svp.h -#usr/include/libart-2.0/libart_lgpl/libart-features.h -#usr/include/libart-2.0/libart_lgpl/libart.h -#usr/lib/libart_lgpl_2.a -#usr/lib/libart_lgpl_2.la -usr/lib/libart_lgpl_2.so -usr/lib/libart_lgpl_2.so.2 -usr/lib/libart_lgpl_2.so.2.3.21 -#usr/lib/pkgconfig/libart-2.0.pc diff --git a/lfs/libart b/lfs/libart deleted file mode 100644 index b5f463683..000000000 --- a/lfs/libart +++ /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 = 2.3.21
-THISAPP = libart_lgpl-$(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 = 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b
-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
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh index 95e6e89db..21d385d78 100755 --- a/make.sh +++ b/make.sh @@ -1331,7 +1331,6 @@ buildipfire() { lfsmake2 libexif lfsmake2 libpng lfsmake2 libtiff
- lfsmake2 libart lfsmake2 gd lfsmake2 slang lfsmake2 newt
-- 2.35.1