[09/35] python3-msgpack: removal as borgbackup uses bundled version

Message ID 20220124161656.71960-9-adolf.belka@ipfire.org
State Accepted
Commit 0e3fb626fb6c632f876c7e94a859164bf90127a1
Headers
Series [01/35] python3: Update to version 3.10.1 |

Commit Message

Adolf Belka Jan. 24, 2022, 4:16 p.m. UTC
  - borgbackup is only package identfied to be using python3-msgpack
- borgbackup has been using its own bundled version of msgpack since version 1.1.10
- Removal of lfs and rootfiles

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 .../rootfiles/packages/armv6l/python3-msgpack | 12 ---
 config/rootfiles/packages/python3-msgpack     | 12 ---
 lfs/python3-msgpack                           | 83 -------------------
 3 files changed, 107 deletions(-)
 delete mode 100644 config/rootfiles/packages/armv6l/python3-msgpack
 delete mode 100644 config/rootfiles/packages/python3-msgpack
 delete mode 100644 lfs/python3-msgpack
  

Comments

Peter Müller Jan. 28, 2022, 12:51 p.m. UTC | #1
We will have to remove this add-on during the Core Update shipping these changes, then.

Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> - borgbackup is only package identfied to be using python3-msgpack
> - borgbackup has been using its own bundled version of msgpack since version 1.1.10
> - Removal of lfs and rootfiles
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>  .../rootfiles/packages/armv6l/python3-msgpack | 12 ---
>  config/rootfiles/packages/python3-msgpack     | 12 ---
>  lfs/python3-msgpack                           | 83 -------------------
>  3 files changed, 107 deletions(-)
>  delete mode 100644 config/rootfiles/packages/armv6l/python3-msgpack
>  delete mode 100644 config/rootfiles/packages/python3-msgpack
>  delete mode 100644 lfs/python3-msgpack
> 
> diff --git a/config/rootfiles/packages/armv6l/python3-msgpack b/config/rootfiles/packages/armv6l/python3-msgpack
> deleted file mode 100644
> index 2bc5b4d0d..000000000
> --- a/config/rootfiles/packages/armv6l/python3-msgpack
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -#usr/lib/python3.8/site-packages/msgpack
> -usr/lib/python3.8/site-packages/msgpack/__init__.py
> -usr/lib/python3.8/site-packages/msgpack/_packer.cpython-38-arm-linux-gnueabi.so
> -usr/lib/python3.8/site-packages/msgpack/_unpacker.cpython-38-arm-linux-gnueabi.so
> -usr/lib/python3.8/site-packages/msgpack/_version.py
> -usr/lib/python3.8/site-packages/msgpack/exceptions.py
> -usr/lib/python3.8/site-packages/msgpack/fallback.py
> -usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info
> -usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/PKG-INFO
> -usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/SOURCES.txt
> -usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/dependency_links.txt
> -usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/top_level.txt
> diff --git a/config/rootfiles/packages/python3-msgpack b/config/rootfiles/packages/python3-msgpack
> deleted file mode 100644
> index a0ecfc6e6..000000000
> --- a/config/rootfiles/packages/python3-msgpack
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -#usr/lib/python3.8/site-packages/msgpack
> -usr/lib/python3.8/site-packages/msgpack/__init__.py
> -usr/lib/python3.8/site-packages/msgpack/_packer.cpython-38-xxxMACHINExxx-linux-gnu.so
> -usr/lib/python3.8/site-packages/msgpack/_unpacker.cpython-38-xxxMACHINExxx-linux-gnu.so
> -usr/lib/python3.8/site-packages/msgpack/_version.py
> -usr/lib/python3.8/site-packages/msgpack/exceptions.py
> -usr/lib/python3.8/site-packages/msgpack/fallback.py
> -#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info
> -#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/PKG-INFO
> -#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/SOURCES.txt
> -#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/dependency_links.txt
> -#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/top_level.txt
> diff --git a/lfs/python3-msgpack b/lfs/python3-msgpack
> deleted file mode 100644
> index dc764f5b3..000000000
> --- a/lfs/python3-msgpack
> +++ /dev/null
> @@ -1,83 +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.5.6
> -
> -THISAPP    = msgpack-python-$(VER)
> -DL_FILE    = $(THISAPP).tar.gz
> -DL_FROM    = $(URL_IPFIRE)
> -DIR_APP    = $(DIR_SRC)/$(THISAPP)
> -TARGET     = $(DIR_INFO)/$(THISAPP)
> -PROG       = python3-msgpack
> -PAK_VER    = 2
> -
> -DEPS       =
> -
> -###############################################################################
> -# Top-level Rules
> -###############################################################################
> -
> -objects = $(DL_FILE)
> -
> -$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> -
> -$(DL_FILE)_MD5 = 6d644c06a87a5a111bbbf5b34b4be440
> -
> -install : $(TARGET)
> -
> -check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> -
> -download :$(patsubst %,$(DIR_DL)/%,$(objects))
> -
> -md5 : $(subst %,%_MD5,$(objects))
> -
> -dist: 
> -	@$(PAK)
> -
> -###############################################################################
> -# Downloading, checking, md5sum
> -###############################################################################
> -
> -$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> -	@$(CHECK)
> -
> -$(patsubst %,$(DIR_DL)/%,$(objects)) :
> -	@$(LOAD)
> -
> -$(subst %,%_MD5,$(objects)) :
> -	@$(MD5)
> -
> -###############################################################################
> -# Installation Details
> -###############################################################################
> -
> -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> -	@$(PREBUILD)
> -	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && python3 setup.py build
> -	cd $(DIR_APP) && python3 setup.py install --root=/
> -	@rm -rf $(DIR_APP)
> -	@$(POSTBUILD)
  

Patch

diff --git a/config/rootfiles/packages/armv6l/python3-msgpack b/config/rootfiles/packages/armv6l/python3-msgpack
deleted file mode 100644
index 2bc5b4d0d..000000000
--- a/config/rootfiles/packages/armv6l/python3-msgpack
+++ /dev/null
@@ -1,12 +0,0 @@ 
-#usr/lib/python3.8/site-packages/msgpack
-usr/lib/python3.8/site-packages/msgpack/__init__.py
-usr/lib/python3.8/site-packages/msgpack/_packer.cpython-38-arm-linux-gnueabi.so
-usr/lib/python3.8/site-packages/msgpack/_unpacker.cpython-38-arm-linux-gnueabi.so
-usr/lib/python3.8/site-packages/msgpack/_version.py
-usr/lib/python3.8/site-packages/msgpack/exceptions.py
-usr/lib/python3.8/site-packages/msgpack/fallback.py
-usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info
-usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/PKG-INFO
-usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/SOURCES.txt
-usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/dependency_links.txt
-usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/top_level.txt
diff --git a/config/rootfiles/packages/python3-msgpack b/config/rootfiles/packages/python3-msgpack
deleted file mode 100644
index a0ecfc6e6..000000000
--- a/config/rootfiles/packages/python3-msgpack
+++ /dev/null
@@ -1,12 +0,0 @@ 
-#usr/lib/python3.8/site-packages/msgpack
-usr/lib/python3.8/site-packages/msgpack/__init__.py
-usr/lib/python3.8/site-packages/msgpack/_packer.cpython-38-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.8/site-packages/msgpack/_unpacker.cpython-38-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.8/site-packages/msgpack/_version.py
-usr/lib/python3.8/site-packages/msgpack/exceptions.py
-usr/lib/python3.8/site-packages/msgpack/fallback.py
-#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info
-#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/PKG-INFO
-#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/SOURCES.txt
-#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/dependency_links.txt
-#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/top_level.txt
diff --git a/lfs/python3-msgpack b/lfs/python3-msgpack
deleted file mode 100644
index dc764f5b3..000000000
--- a/lfs/python3-msgpack
+++ /dev/null
@@ -1,83 +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.5.6
-
-THISAPP    = msgpack-python-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = python3-msgpack
-PAK_VER    = 2
-
-DEPS       =
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 6d644c06a87a5a111bbbf5b34b4be440
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && python3 setup.py build
-	cd $(DIR_APP) && python3 setup.py install --root=/
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)