* [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 33cfcae627a50d24683e3b365d4d65f54184d030
@ 2021-07-01 17:16 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2021-07-01 17:16 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6956 bytes --]
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, master has been updated
via 33cfcae627a50d24683e3b365d4d65f54184d030 (commit)
via 5996c2815798e7bb8c069caad40ffb084ecf1cf7 (commit)
from 29e59d8c3ecbea5b1f4ebc2bd76384d40e903262 (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 33cfcae627a50d24683e3b365d4d65f54184d030
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jul 1 17:16:36 2021 +0000
aws-cli: Depend on python3-six
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5996c2815798e7bb8c069caad40ffb084ecf1cf7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jul 1 17:16:09 2021 +0000
Revert "python-six: Removal of python2 & 3 addon versions of six"
This reverts commit 3a61ae73fa179adb24f9feeb8ee486c1900609bf.
This module is required by awscli.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/python3-six | 6 ++++++
lfs/aws-cli | 4 ++--
lfs/{python3-pyasn1 => python3-six} | 8 ++++----
make.sh | 1 +
4 files changed, 13 insertions(+), 6 deletions(-)
create mode 100644 config/rootfiles/packages/python3-six
copy lfs/{python3-pyasn1 => python3-six} (96%)
Difference in files:
diff --git a/config/rootfiles/packages/python3-six b/config/rootfiles/packages/python3-six
new file mode 100644
index 000000000..0801d36da
--- /dev/null
+++ b/config/rootfiles/packages/python3-six
@@ -0,0 +1,6 @@
+#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info
+#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/PKG-INFO
+#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/SOURCES.txt
+#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/dependency_links.txt
+#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/top_level.txt
+usr/lib/python3.8/site-packages/six.py
diff --git a/lfs/aws-cli b/lfs/aws-cli
index 599469ee3..a098f9ad8 100644
--- a/lfs/aws-cli
+++ b/lfs/aws-cli
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = aws-cli
-PAK_VER = 3
+PAK_VER = 4
-DEPS = python3-botocore python3-colorama python3-docutils python3-pyasn1 python3-rsa python3-s3transfer python3-yaml
+DEPS = python3-botocore python3-colorama python3-docutils python3-pyasn1 python3-rsa python3-s3transfer python3-six python3-yaml
###############################################################################
# Top-level Rules
diff --git a/lfs/python3-six b/lfs/python3-six
new file mode 100644
index 000000000..9d467f273
--- /dev/null
+++ b/lfs/python3-six
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# 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
+
+VER = 1.14.0
+
+THISAPP = six-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = python3-six
+PAK_VER = 3
+
+DEPS =
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 21674588a57e649d1a6d977ec3122140
+
+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)
diff --git a/make.sh b/make.sh
index fc03ebcd5..83bd9faeb 100755
--- a/make.sh
+++ b/make.sh
@@ -1534,6 +1534,7 @@ buildipfire() {
lfsmake2 libsolv
lfsmake2 ddns
lfsmake2 python3-setuptools-scm
+ lfsmake2 python3-six
lfsmake2 python3-dateutil
lfsmake2 python3-jmespath
lfsmake2 python3-colorama
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-01 17:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-01 17:16 [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 33cfcae627a50d24683e3b365d4d65f54184d030 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox