* [PATCH 2/5] Add new package python3-setuptools-scm
2019-02-01 11:52 [PATCH 1/5] Add new package python3-settuptools Jonatan Schlag
@ 2019-02-01 11:52 ` Jonatan Schlag
2019-02-01 11:52 ` [PATCH 3/5] Add new package python3-llfuse Jonatan Schlag
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Jonatan Schlag @ 2019-02-01 11:52 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 7346 bytes --]
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
config/rootfiles/common/python3-setuptools-scm | 37 ++++++++++++
lfs/python3-setuptools-scm | 83 ++++++++++++++++++++++++++
make.sh | 1 +
3 files changed, 121 insertions(+)
create mode 100644 config/rootfiles/common/python3-setuptools-scm
create mode 100644 lfs/python3-setuptools-scm
diff --git a/config/rootfiles/common/python3-setuptools-scm b/config/rootfiles/common/python3-setuptools-scm
new file mode 100644
index 0000000..bcc3d1c
--- /dev/null
+++ b/config/rootfiles/common/python3-setuptools-scm
@@ -0,0 +1,37 @@
+#usr/lib/python3.6/site-packages/setuptools_scm
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/PKG-INFO
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/SOURCES.txt
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/dependency_links.txt
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/entry_points.txt
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/top_level.txt
+#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/zip-safe
+#usr/lib/python3.6/site-packages/setuptools_scm/__init__.py
+#usr/lib/python3.6/site-packages/setuptools_scm/__main__.py
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/__init__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/__main__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/config.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/discover.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/file_finder.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/file_finder_git.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/file_finder_hg.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/git.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/hacks.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/hg.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/integration.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/utils.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/version.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/win_py31_compat.cpython-36.pyc
+#usr/lib/python3.6/site-packages/setuptools_scm/config.py
+#usr/lib/python3.6/site-packages/setuptools_scm/discover.py
+#usr/lib/python3.6/site-packages/setuptools_scm/file_finder.py
+#usr/lib/python3.6/site-packages/setuptools_scm/file_finder_git.py
+#usr/lib/python3.6/site-packages/setuptools_scm/file_finder_hg.py
+#usr/lib/python3.6/site-packages/setuptools_scm/git.py
+#usr/lib/python3.6/site-packages/setuptools_scm/hacks.py
+#usr/lib/python3.6/site-packages/setuptools_scm/hg.py
+#usr/lib/python3.6/site-packages/setuptools_scm/integration.py
+#usr/lib/python3.6/site-packages/setuptools_scm/utils.py
+#usr/lib/python3.6/site-packages/setuptools_scm/version.py
+#usr/lib/python3.6/site-packages/setuptools_scm/win_py31_compat.py
diff --git a/lfs/python3-setuptools-scm b/lfs/python3-setuptools-scm
new file mode 100644
index 0000000..41f653b
--- /dev/null
+++ b/lfs/python3-setuptools-scm
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 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 = 3.2.0
+
+THISAPP = setuptools_scm-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = python3-setuptools-scm
+PAK_VER = 1
+
+DEPS = "python3"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 178e4e7b14c163e0e77ae7ec6684cc0f
+
+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 302346b..507cde6 100755
--- a/make.sh
+++ b/make.sh
@@ -1501,6 +1501,7 @@ buildipfire() {
lfsmake2 python-xattr
lfsmake2 ddns
lfsmake2 python3-setuptools
+ lfsmake2 python3-setuptools-scm
lfsmake2 python3-six
lfsmake2 python3-dateutil
lfsmake2 python3-jmespath
--
1.8.3.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 3/5] Add new package python3-llfuse
2019-02-01 11:52 [PATCH 1/5] Add new package python3-settuptools Jonatan Schlag
2019-02-01 11:52 ` [PATCH 2/5] Add new package python3-setuptools-scm Jonatan Schlag
@ 2019-02-01 11:52 ` Jonatan Schlag
2019-02-01 11:52 ` [PATCH 4/5] Add new package python3-msgpack Jonatan Schlag
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Jonatan Schlag @ 2019-02-01 11:52 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4969 bytes --]
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
config/rootfiles/packages/python3-llfuse | 7 +++
lfs/python3-llfuse | 83 ++++++++++++++++++++++++++++++++
make.sh | 1 +
3 files changed, 91 insertions(+)
create mode 100644 config/rootfiles/packages/python3-llfuse
create mode 100644 lfs/python3-llfuse
diff --git a/config/rootfiles/packages/python3-llfuse b/config/rootfiles/packages/python3-llfuse
new file mode 100644
index 0000000..7d96ce7
--- /dev/null
+++ b/config/rootfiles/packages/python3-llfuse
@@ -0,0 +1,7 @@
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/top_level.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/zip-safe
+usr/lib/python3.6/site-packages/llfuse.cpython-36m-x86_64-linux-gnu.so
diff --git a/lfs/python3-llfuse b/lfs/python3-llfuse
new file mode 100644
index 0000000..175c6c2
--- /dev/null
+++ b/lfs/python3-llfuse
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 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.3.5
+
+THISAPP = llfuse-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = python3-llfuse
+PAK_VER = 1
+
+DEPS = "python3"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 9fbb82c0db909d139f9fafa27c76781e
+
+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 jxf $(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 507cde6..9eb4fbf 100755
--- a/make.sh
+++ b/make.sh
@@ -1512,6 +1512,7 @@ buildipfire() {
lfsmake2 python3-rsa
lfsmake2 python3-pyasn1
lfsmake2 python3-botocore
+ lfsmake2 python3-llfuse
lfsmake2 aws-cli
lfsmake2 transmission
lfsmake2 dpfhack
--
1.8.3.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 4/5] Add new package python3-msgpack
2019-02-01 11:52 [PATCH 1/5] Add new package python3-settuptools Jonatan Schlag
2019-02-01 11:52 ` [PATCH 2/5] Add new package python3-setuptools-scm Jonatan Schlag
2019-02-01 11:52 ` [PATCH 3/5] Add new package python3-llfuse Jonatan Schlag
@ 2019-02-01 11:52 ` Jonatan Schlag
2019-02-03 1:52 ` Matthias Fischer
2019-02-01 11:52 ` [PATCH 5/5] Add new package borgbackup Jonatan Schlag
2019-02-01 16:32 ` [PATCH 1/5] Add new package python3-settuptools Michael Tremer
4 siblings, 1 reply; 11+ messages in thread
From: Jonatan Schlag @ 2019-02-01 11:52 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5690 bytes --]
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
config/rootfiles/packages/python3-msgpack | 17 +++++++
lfs/python3-msgpack | 83 +++++++++++++++++++++++++++++++
make.sh | 1 +
3 files changed, 101 insertions(+)
create mode 100644 config/rootfiles/packages/python3-msgpack
create mode 100644 lfs/python3-msgpack
diff --git a/config/rootfiles/packages/python3-msgpack b/config/rootfiles/packages/python3-msgpack
new file mode 100644
index 0000000..1cc53c4
--- /dev/null
+++ b/config/rootfiles/packages/python3-msgpack
@@ -0,0 +1,17 @@
+#usr/lib/python3.6/site-packages/msgpack
+usr/lib/python3.6/site-packages/msgpack/__init__.py
+usr/lib/python3.6/site-packages/msgpack/__pycache__
+usr/lib/python3.6/site-packages/msgpack/__pycache__/__init__.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/_version.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/exceptions.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/fallback.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/msgpack/_version.py
+usr/lib/python3.6/site-packages/msgpack/exceptions.py
+usr/lib/python3.6/site-packages/msgpack/fallback.py
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/top_level.txt
diff --git a/lfs/python3-msgpack b/lfs/python3-msgpack
new file mode 100644
index 0000000..1d9280a
--- /dev/null
+++ b/lfs/python3-msgpack
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 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 = 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 = 1
+
+DEPS = "python3"
+
+###############################################################################
+# 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)
diff --git a/make.sh b/make.sh
index 9eb4fbf..68882fc 100755
--- a/make.sh
+++ b/make.sh
@@ -1513,6 +1513,7 @@ buildipfire() {
lfsmake2 python3-pyasn1
lfsmake2 python3-botocore
lfsmake2 python3-llfuse
+ lfsmake2 python3-msgpack
lfsmake2 aws-cli
lfsmake2 transmission
lfsmake2 dpfhack
--
1.8.3.1
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 4/5] Add new package python3-msgpack
2019-02-01 11:52 ` [PATCH 4/5] Add new package python3-msgpack Jonatan Schlag
@ 2019-02-03 1:52 ` Matthias Fischer
2019-02-03 13:19 ` Matthias Fischer
0 siblings, 1 reply; 11+ messages in thread
From: Matthias Fischer @ 2019-02-03 1:52 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 7464 bytes --]
Hi,
Something weird happened.
While building and packaging current 'next' I ran into an error with
'python3-msgpack':
***SNIP***
...
'/usr/src/config/rootfiles/packages//python3-msgpack' ->
'/install/packages/package/ROOTFILES'
tar:
usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-i586-linux-gnu.so:
Cannot stat: No such file or directory
tar:
usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-i586-linux-gnu.so:
Cannot stat: No such file or directory
tar: Exiting with failure status due to previous errors
make: *** [python3-msgpack:58: dist] Error 2
...
ERROR: Packaging python3-msgpack [ FAIL ]
Check /home/matz/ipfire-2.x/log/_build.packages.log for errors if
applicable [ FAIL ]
***SNAP***
I tested with current 'curl 7.63' and 'dhcpcd 7.1.0'.
'log/msgpack-python-0.5.6' shows the following entries:
...
+usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-i386-linux-gnu.so
...
-usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-i586-linux-gnu.so
-usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-i586-linux-gnu.so
...
As you can see, "MACHINE" got translated into 'i386' here. These files
exist, but can't be found during packaging. It looks for 'i586'.
Can anyone confirm?
Best,
Matthias
On 01.02.2019 12:52, Jonatan Schlag wrote:
> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> ---
> config/rootfiles/packages/python3-msgpack | 17 +++++++
> lfs/python3-msgpack | 83 +++++++++++++++++++++++++++++++
> make.sh | 1 +
> 3 files changed, 101 insertions(+)
> create mode 100644 config/rootfiles/packages/python3-msgpack
> create mode 100644 lfs/python3-msgpack
>
> diff --git a/config/rootfiles/packages/python3-msgpack b/config/rootfiles/packages/python3-msgpack
> new file mode 100644
> index 0000000..1cc53c4
> --- /dev/null
> +++ b/config/rootfiles/packages/python3-msgpack
> @@ -0,0 +1,17 @@
> +#usr/lib/python3.6/site-packages/msgpack
> +usr/lib/python3.6/site-packages/msgpack/__init__.py
> +usr/lib/python3.6/site-packages/msgpack/__pycache__
> +usr/lib/python3.6/site-packages/msgpack/__pycache__/__init__.cpython-36.pyc
> +usr/lib/python3.6/site-packages/msgpack/__pycache__/_version.cpython-36.pyc
> +usr/lib/python3.6/site-packages/msgpack/__pycache__/exceptions.cpython-36.pyc
> +usr/lib/python3.6/site-packages/msgpack/__pycache__/fallback.cpython-36.pyc
> +usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-MACHINE-linux-gnu.so
> +usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-MACHINE-linux-gnu.so
> +usr/lib/python3.6/site-packages/msgpack/_version.py
> +usr/lib/python3.6/site-packages/msgpack/exceptions.py
> +usr/lib/python3.6/site-packages/msgpack/fallback.py
> +usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info
> +usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/PKG-INFO
> +usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/SOURCES.txt
> +usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/dependency_links.txt
> +usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/top_level.txt
> diff --git a/lfs/python3-msgpack b/lfs/python3-msgpack
> new file mode 100644
> index 0000000..1d9280a
> --- /dev/null
> +++ b/lfs/python3-msgpack
> @@ -0,0 +1,83 @@
> +###############################################################################
> +# #
> +# IPFire.org - A linux based firewall #
> +# Copyright (C) 2007-2018 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 = 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 = 1
> +
> +DEPS = "python3"
> +
> +###############################################################################
> +# 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)
> diff --git a/make.sh b/make.sh
> index 9eb4fbf..68882fc 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1513,6 +1513,7 @@ buildipfire() {
> lfsmake2 python3-pyasn1
> lfsmake2 python3-botocore
> lfsmake2 python3-llfuse
> + lfsmake2 python3-msgpack
> lfsmake2 aws-cli
> lfsmake2 transmission
> lfsmake2 dpfhack
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 4/5] Add new package python3-msgpack
2019-02-03 1:52 ` Matthias Fischer
@ 2019-02-03 13:19 ` Matthias Fischer
2019-02-03 21:45 ` Michael Tremer
0 siblings, 1 reply; 11+ messages in thread
From: Matthias Fischer @ 2019-02-03 13:19 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]
On 03.02.2019 02:52, Matthias Fischer wrote:
> Hi,
>
> Something weird happened.
>
> While building and packaging current 'next' I ran into an error with
> 'python3-msgpack':
>
> ***SNIP***
> ...
> '/usr/src/config/rootfiles/packages//python3-msgpack' ->
> '/install/packages/package/ROOTFILES'
> tar:
> usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-i586-linux-gnu.so:
> Cannot stat: No such file or directory
> tar:
> usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-i586-linux-gnu.so:
> Cannot stat: No such file or directory
> tar: Exiting with failure status due to previous errors
> make: *** [python3-msgpack:58: dist] Error 2
> ...
>
> ERROR: Packaging python3-msgpack [ FAIL ]
> Check /home/matz/ipfire-2.x/log/_build.packages.log for errors if
> applicable [ FAIL ]
>
> ***SNAP***
> ...
Confirmed with second - clean - build using current 'next', this time
without 'curl 7.63.0'. Identical error.
Best,
Matthias
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/5] Add new package python3-msgpack
2019-02-03 13:19 ` Matthias Fischer
@ 2019-02-03 21:45 ` Michael Tremer
2019-02-04 17:23 ` Matthias Fischer
0 siblings, 1 reply; 11+ messages in thread
From: Michael Tremer @ 2019-02-03 21:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1310 bytes --]
Sorry, I overlooked those in Jonatan’s patch.
Arne has fixed this next now - I believe.
-Michael
> On 3 Feb 2019, at 13:19, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>
> On 03.02.2019 02:52, Matthias Fischer wrote:
>> Hi,
>>
>> Something weird happened.
>>
>> While building and packaging current 'next' I ran into an error with
>> 'python3-msgpack':
>>
>> ***SNIP***
>> ...
>> '/usr/src/config/rootfiles/packages//python3-msgpack' ->
>> '/install/packages/package/ROOTFILES'
>> tar:
>> usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-i586-linux-gnu.so:
>> Cannot stat: No such file or directory
>> tar:
>> usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-i586-linux-gnu.so:
>> Cannot stat: No such file or directory
>> tar: Exiting with failure status due to previous errors
>> make: *** [python3-msgpack:58: dist] Error 2
>> ...
>>
>> ERROR: Packaging python3-msgpack [ FAIL ]
>> Check /home/matz/ipfire-2.x/log/_build.packages.log for errors if
>> applicable [ FAIL ]
>>
>> ***SNAP***
>> ...
>
> Confirmed with second - clean - build using current 'next', this time
> without 'curl 7.63.0'. Identical error.
>
> Best,
> Matthias
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/5] Add new package python3-msgpack
2019-02-03 21:45 ` Michael Tremer
@ 2019-02-04 17:23 ` Matthias Fischer
2019-02-04 22:44 ` Michael Tremer
0 siblings, 1 reply; 11+ messages in thread
From: Matthias Fischer @ 2019-02-04 17:23 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2191 bytes --]
Hi,
On 03.02.2019 22:45, Michael Tremer wrote:
> Sorry, I overlooked those in Jonatan’s patch.
>
> Arne has fixed this next now - I believe.
Sorry, that didn't help.
Tonight I made a third test build containing your fix: same error as below.
Contents of /build/usr/lib/python3.6/site-packages/msgpack/:
...
root(a)Devel:
/home/matz/ipfire-2.x/build/usr/lib/python3.6/site-packages/msgpack # ls -l
total 292
-rw-r--r-- 1 root root 1056 Jul 30 2016 exceptions.py
-rw-r--r-- 1 root root 35973 Mar 10 2018 fallback.py
-rw-r--r-- 1 root root 1605 Mar 10 2018 __init__.py
-rwxr-xr-x 1 root root 108124 Feb 4 01:56
_packer.cpython-36m-i386-linux-gnu.so
drwxr-xr-x 2 root root 4096 Feb 4 01:29 __pycache__
-rwxr-xr-x 1 root root 134828 Feb 4 01:56
_unpacker.cpython-36m-i386-linux-gnu.so
-rw-r--r-- 1 root root 20 Mar 10 2018 _version.py
...
Something I can do?
Best,
Matthias
> -Michael
>
>> On 3 Feb 2019, at 13:19, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>>
>> On 03.02.2019 02:52, Matthias Fischer wrote:
>>> Hi,
>>>
>>> Something weird happened.
>>>
>>> While building and packaging current 'next' I ran into an error with
>>> 'python3-msgpack':
>>>
>>> ***SNIP***
>>> ...
>>> '/usr/src/config/rootfiles/packages//python3-msgpack' ->
>>> '/install/packages/package/ROOTFILES'
>>> tar:
>>> usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-i586-linux-gnu.so:
>>> Cannot stat: No such file or directory
>>> tar:
>>> usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-i586-linux-gnu.so:
>>> Cannot stat: No such file or directory
>>> tar: Exiting with failure status due to previous errors
>>> make: *** [python3-msgpack:58: dist] Error 2
>>> ...
>>>
>>> ERROR: Packaging python3-msgpack [ FAIL ]
>>> Check /home/matz/ipfire-2.x/log/_build.packages.log for errors if
>>> applicable [ FAIL ]
>>>
>>> ***SNAP***
>>> ...
>>
>> Confirmed with second - clean - build using current 'next', this time
>> without 'curl 7.63.0'. Identical error.
>>
>> Best,
>> Matthias
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/5] Add new package python3-msgpack
2019-02-04 17:23 ` Matthias Fischer
@ 2019-02-04 22:44 ` Michael Tremer
0 siblings, 0 replies; 11+ messages in thread
From: Michael Tremer @ 2019-02-04 22:44 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2501 bytes --]
I gave Jonatan a call today and made him aware of this.
Please get this fixed as soon as possible.
-Michael
> On 4 Feb 2019, at 17:23, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>
> Hi,
>
> On 03.02.2019 22:45, Michael Tremer wrote:
>> Sorry, I overlooked those in Jonatan’s patch.
>>
>> Arne has fixed this next now - I believe.
>
> Sorry, that didn't help.
>
> Tonight I made a third test build containing your fix: same error as below.
>
> Contents of /build/usr/lib/python3.6/site-packages/msgpack/:
>
> ...
> root(a)Devel:
> /home/matz/ipfire-2.x/build/usr/lib/python3.6/site-packages/msgpack # ls -l
> total 292
> -rw-r--r-- 1 root root 1056 Jul 30 2016 exceptions.py
> -rw-r--r-- 1 root root 35973 Mar 10 2018 fallback.py
> -rw-r--r-- 1 root root 1605 Mar 10 2018 __init__.py
> -rwxr-xr-x 1 root root 108124 Feb 4 01:56
> _packer.cpython-36m-i386-linux-gnu.so
> drwxr-xr-x 2 root root 4096 Feb 4 01:29 __pycache__
> -rwxr-xr-x 1 root root 134828 Feb 4 01:56
> _unpacker.cpython-36m-i386-linux-gnu.so
> -rw-r--r-- 1 root root 20 Mar 10 2018 _version.py
> ...
>
> Something I can do?
>
> Best,
> Matthias
>
>> -Michael
>>
>>> On 3 Feb 2019, at 13:19, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>>>
>>> On 03.02.2019 02:52, Matthias Fischer wrote:
>>>> Hi,
>>>>
>>>> Something weird happened.
>>>>
>>>> While building and packaging current 'next' I ran into an error with
>>>> 'python3-msgpack':
>>>>
>>>> ***SNIP***
>>>> ...
>>>> '/usr/src/config/rootfiles/packages//python3-msgpack' ->
>>>> '/install/packages/package/ROOTFILES'
>>>> tar:
>>>> usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-i586-linux-gnu.so:
>>>> Cannot stat: No such file or directory
>>>> tar:
>>>> usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-i586-linux-gnu.so:
>>>> Cannot stat: No such file or directory
>>>> tar: Exiting with failure status due to previous errors
>>>> make: *** [python3-msgpack:58: dist] Error 2
>>>> ...
>>>>
>>>> ERROR: Packaging python3-msgpack [ FAIL ]
>>>> Check /home/matz/ipfire-2.x/log/_build.packages.log for errors if
>>>> applicable [ FAIL ]
>>>>
>>>> ***SNAP***
>>>> ...
>>>
>>> Confirmed with second - clean - build using current 'next', this time
>>> without 'curl 7.63.0'. Identical error.
>>>
>>> Best,
>>> Matthias
>>
>>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 5/5] Add new package borgbackup
2019-02-01 11:52 [PATCH 1/5] Add new package python3-settuptools Jonatan Schlag
` (2 preceding siblings ...)
2019-02-01 11:52 ` [PATCH 4/5] Add new package python3-msgpack Jonatan Schlag
@ 2019-02-01 11:52 ` Jonatan Schlag
2019-02-01 16:32 ` [PATCH 1/5] Add new package python3-settuptools Michael Tremer
4 siblings, 0 replies; 11+ messages in thread
From: Jonatan Schlag @ 2019-02-01 11:52 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 11596 bytes --]
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
config/rootfiles/packages/borgbackup | 109 +++++++++++++++++++++++++++++++++++
lfs/borgbackup | 83 ++++++++++++++++++++++++++
make.sh | 1 +
3 files changed, 193 insertions(+)
create mode 100644 config/rootfiles/packages/borgbackup
create mode 100644 lfs/borgbackup
diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup
new file mode 100644
index 0000000..32aacc0
--- /dev/null
+++ b/config/rootfiles/packages/borgbackup
@@ -0,0 +1,109 @@
+usr/bin/borg
+usr/lib/python3.6/site-packages/borg
+usr/lib/python3.6/site-packages/borg/__init__.py
+usr/lib/python3.6/site-packages/borg/__main__.py
+usr/lib/python3.6/site-packages/borg/__pycache__
+usr/lib/python3.6/site-packages/borg/__pycache__/__init__.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/__main__.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/_version.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/archive.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/archiver.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/cache.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/fuse.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/helpers.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/key.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/keymanager.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/locking.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/logger.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/lrucache.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/platform.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/remote.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/repository.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/shellpattern.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/upgrader.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/xattr.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/_chunker.c
+usr/lib/python3.6/site-packages/borg/_hashindex.c
+usr/lib/python3.6/site-packages/borg/_version.py
+usr/lib/python3.6/site-packages/borg/archive.py
+usr/lib/python3.6/site-packages/borg/archiver.py
+usr/lib/python3.6/site-packages/borg/cache.py
+usr/lib/python3.6/site-packages/borg/chunker.c
+usr/lib/python3.6/site-packages/borg/chunker.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/chunker.pyx
+usr/lib/python3.6/site-packages/borg/compress.c
+usr/lib/python3.6/site-packages/borg/compress.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/compress.pyx
+usr/lib/python3.6/site-packages/borg/crypto.c
+usr/lib/python3.6/site-packages/borg/crypto.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/crypto.pyx
+usr/lib/python3.6/site-packages/borg/fuse.py
+usr/lib/python3.6/site-packages/borg/hashindex.c
+usr/lib/python3.6/site-packages/borg/hashindex.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/hashindex.pyx
+usr/lib/python3.6/site-packages/borg/helpers.py
+usr/lib/python3.6/site-packages/borg/key.py
+usr/lib/python3.6/site-packages/borg/keymanager.py
+usr/lib/python3.6/site-packages/borg/locking.py
+usr/lib/python3.6/site-packages/borg/logger.py
+usr/lib/python3.6/site-packages/borg/lrucache.py
+usr/lib/python3.6/site-packages/borg/paperkey.html
+usr/lib/python3.6/site-packages/borg/platform.py
+usr/lib/python3.6/site-packages/borg/platform_darwin.c
+usr/lib/python3.6/site-packages/borg/platform_darwin.pyx
+usr/lib/python3.6/site-packages/borg/platform_freebsd.c
+usr/lib/python3.6/site-packages/borg/platform_freebsd.pyx
+usr/lib/python3.6/site-packages/borg/platform_linux.c
+usr/lib/python3.6/site-packages/borg/platform_linux.cpython-36m-MACHINE-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/platform_linux.pyx
+usr/lib/python3.6/site-packages/borg/remote.py
+usr/lib/python3.6/site-packages/borg/repository.py
+usr/lib/python3.6/site-packages/borg/shellpattern.py
+#usr/lib/python3.6/site-packages/borg/testsuite
+#usr/lib/python3.6/site-packages/borg/testsuite/__init__.py
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/__init__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archive.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archiver.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/benchmark.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/chunker.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/compress.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/crypto.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/hashindex.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/helpers.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/key.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/locking.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/logger.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/lrucache.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/platform.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/repository.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/shellpattern.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/upgrader.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/xattr.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/archive.py
+#usr/lib/python3.6/site-packages/borg/testsuite/archiver.py
+#usr/lib/python3.6/site-packages/borg/testsuite/attic.tar.gz
+#usr/lib/python3.6/site-packages/borg/testsuite/benchmark.py
+#usr/lib/python3.6/site-packages/borg/testsuite/chunker.py
+#usr/lib/python3.6/site-packages/borg/testsuite/compress.py
+#usr/lib/python3.6/site-packages/borg/testsuite/crypto.py
+#usr/lib/python3.6/site-packages/borg/testsuite/hashindex.py
+#usr/lib/python3.6/site-packages/borg/testsuite/helpers.py
+#usr/lib/python3.6/site-packages/borg/testsuite/key.py
+#usr/lib/python3.6/site-packages/borg/testsuite/locking.py
+#usr/lib/python3.6/site-packages/borg/testsuite/logger.py
+#usr/lib/python3.6/site-packages/borg/testsuite/lrucache.py
+#usr/lib/python3.6/site-packages/borg/testsuite/platform.py
+#usr/lib/python3.6/site-packages/borg/testsuite/repository.py
+#usr/lib/python3.6/site-packages/borg/testsuite/shellpattern.py
+#usr/lib/python3.6/site-packages/borg/testsuite/upgrader.py
+#usr/lib/python3.6/site-packages/borg/testsuite/xattr.py
+usr/lib/python3.6/site-packages/borg/upgrader.py
+usr/lib/python3.6/site-packages/borg/xattr.py
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/entry_points.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/requires.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/top_level.txt
diff --git a/lfs/borgbackup b/lfs/borgbackup
new file mode 100644
index 0000000..a00a059
--- /dev/null
+++ b/lfs/borgbackup
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 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.0.12
+
+THISAPP = borgbackup-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = borgbackup
+PAK_VER = 1
+
+DEPS = "python3 python3-llfuse python3-msgpack"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7bd9fa82a517d559d56a4e1ff5965bc8
+
+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 68882fc..f96b74b 100755
--- a/make.sh
+++ b/make.sh
@@ -1587,6 +1587,7 @@ buildipfire() {
lfsmake2 nss-myhostname
lfsmake2 dehydrated
lfsmake2 shairport-sync
+ lfsmake2 borgbackup
}
buildinstaller() {
--
1.8.3.1
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 1/5] Add new package python3-settuptools
2019-02-01 11:52 [PATCH 1/5] Add new package python3-settuptools Jonatan Schlag
` (3 preceding siblings ...)
2019-02-01 11:52 ` [PATCH 5/5] Add new package borgbackup Jonatan Schlag
@ 2019-02-01 16:32 ` Michael Tremer
4 siblings, 0 replies; 11+ messages in thread
From: Michael Tremer @ 2019-02-01 16:32 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 9907 bytes --]
Hello,
Thanks for sending this in. It looks all good. Good work!
But what is borgbackup for?
-Michael
> On 1 Feb 2019, at 11:52, Jonatan Schlag <jonatan.schlag(a)ipfire.org> wrote:
>
> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> ---
> config/rootfiles/common/python3-setuptools | 60 +++++++++++++++++++++
> lfs/python3-setuptools | 85 ++++++++++++++++++++++++++++++
> make.sh | 1 +
> 3 files changed, 146 insertions(+)
> create mode 100644 config/rootfiles/common/python3-setuptools
> create mode 100644 lfs/python3-setuptools
>
> diff --git a/config/rootfiles/common/python3-setuptools b/config/rootfiles/common/python3-setuptools
> new file mode 100644
> index 0000000..ee78dcd
> --- /dev/null
> +++ b/config/rootfiles/common/python3-setuptools
> @@ -0,0 +1,60 @@
> +#usr/lib/python3.6/site-packages/pkg_resources/__pycache__/py31compat.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/pkg_resources/py31compat.py
> +#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info
> +#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/PKG-INFO
> +#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/SOURCES.txt
> +#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/dependency_links.txt
> +#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/entry_points.txt
> +#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/requires.txt
> +#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/top_level.txt
> +#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/zip-safe
> +#usr/lib/python3.6/site-packages/setuptools/__pycache__/_deprecation_warning.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/__pycache__/build_meta.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/__pycache__/config.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/__pycache__/dep_util.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/__pycache__/glibc.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/__pycache__/pep425tags.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/__pycache__/py33compat.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/__pycache__/py36compat.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/__pycache__/wheel.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_deprecation_warning.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/__init__.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__/__init__.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__/pyparsing.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__/six.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__about__.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__init__.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/__about__.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/__init__.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/_compat.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/_structures.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/markers.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/requirements.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/specifiers.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/utils.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/version.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/_compat.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/_structures.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/markers.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/requirements.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/specifiers.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/utils.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/version.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/pyparsing.py
> +#usr/lib/python3.6/site-packages/setuptools/_vendor/six.py
> +#usr/lib/python3.6/site-packages/setuptools/build_meta.py
> +#usr/lib/python3.6/site-packages/setuptools/command/__pycache__/build_clib.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/command/__pycache__/dist_info.cpython-36.pyc
> +#usr/lib/python3.6/site-packages/setuptools/command/build_clib.py
> +#usr/lib/python3.6/site-packages/setuptools/command/dist_info.py
> +#usr/lib/python3.6/site-packages/setuptools/config.py
> +#usr/lib/python3.6/site-packages/setuptools/dep_util.py
> +#usr/lib/python3.6/site-packages/setuptools/glibc.py
> +#usr/lib/python3.6/site-packages/setuptools/pep425tags.py
> +#usr/lib/python3.6/site-packages/setuptools/py33compat.py
> +#usr/lib/python3.6/site-packages/setuptools/py36compat.py
> +#usr/lib/python3.6/site-packages/setuptools/wheel.py
> diff --git a/lfs/python3-setuptools b/lfs/python3-setuptools
> new file mode 100644
> index 0000000..5791452
> --- /dev/null
> +++ b/lfs/python3-setuptools
> @@ -0,0 +1,85 @@
> +###############################################################################
> +# #
> +# IPFire.org - A linux based firewall #
> +# Copyright (C) 2007-2018 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 = 40.6.3
> +
> +THISAPP = setuptools-$(VER)
> +DL_FILE = $(THISAPP).tar.gz
> +DL_FROM = $(URL_IPFIRE)
> +DIR_APP = $(DIR_SRC)/$(THISAPP)
> +TARGET = $(DIR_INFO)/$(THISAPP)
> +PROG = python3-setuptools
> +PAK_VER = 1
> +
> +DEPS = "python3"
> +
> +###############################################################################
> +# Top-level Rules
> +###############################################################################
> +
> +objects = $(DL_FILE)
> +
> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +
> +$(DL_FILE)_MD5 = 425b58efe131537abde25c1b5624527a
> +
> +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) && sed -e '/tag_build = .post/d' -e '/tag_date = 1/d' -i setup.cfg
> + cd $(DIR_APP) && python3 bootstrap.py
> + 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 50f5be4..302346b 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1500,6 +1500,7 @@ buildipfire() {
> lfsmake2 python-progressbar
> lfsmake2 python-xattr
> lfsmake2 ddns
> + lfsmake2 python3-setuptools
> lfsmake2 python3-six
> lfsmake2 python3-dateutil
> lfsmake2 python3-jmespath
> --
> 1.8.3.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread