From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 4/6] libsolv: Removal from IPFire
Date: Thu, 07 Apr 2022 13:04:47 +0200 [thread overview]
Message-ID: <20220407110449.1923450-4-adolf.belka@ipfire.org> (raw)
In-Reply-To: <20220407110449.1923450-1-adolf.belka@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 6755 bytes --]
Signed-off-by: Adolf Belka <adolf.belka(a)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(a)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
next prev parent reply other threads:[~2022-04-07 11:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 11:04 [PATCH 1/6] libart: " Adolf Belka
2022-04-07 11:04 ` [PATCH 2/6] libdnet: " Adolf Belka
2022-04-07 15:54 ` Michael Tremer
2022-04-07 11:04 ` [PATCH 3/6] libpri: " Adolf Belka
2022-04-07 15:54 ` Michael Tremer
2022-04-07 11:04 ` Adolf Belka [this message]
2022-04-07 15:54 ` [PATCH 4/6] libsolv: " Michael Tremer
2022-04-07 11:04 ` [PATCH 5/6] pigz: " Adolf Belka
2022-04-07 15:54 ` Michael Tremer
2022-04-07 11:04 ` [PATCH 6/6] sdparm: " Adolf Belka
2022-04-07 15:54 ` Michael Tremer
2022-04-07 15:54 ` [PATCH 1/6] libart: " Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220407110449.1923450-4-adolf.belka@ipfire.org \
--to=adolf.belka@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox