Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

borgbackup: update to 1.1.7, add borgmatic 1.2.2 #3471

Merged
merged 5 commits into from
Nov 30, 2018
Merged

borgbackup: update to 1.1.7, add borgmatic 1.2.2 #3471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
417393f
borgbackup: update to 1.1.7, add borgmatic 1.2.2
yuroller Sep 28, 2018
a3b8c30
[borgbackup] increase revision
ymartin59 Oct 22, 2018
c40c8ab
update ruamel.yaml
ymartin59 Nov 25, 2018
d627aa6
improve installer logging for diagnostic
ymartin59 Nov 25, 2018
9dd99e0
Merge branch 'master' into borgbackup_1.1.7-borgmatic_1.2.2
ymartin59 Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions cross/acl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,17 @@ PKG_DIST_SITE = http://download.savannah.gnu.org/releases/acl
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/attr
ADDITIONAL_CFLAGS = -I$(STAGING_INSTALL_PREFIX)/include/

HOMEPAGE = http://kernel.org/
COMMENT =
LICENSE =

GNU_CONFIGURE = 1
INSTALL_TARGET = myInstall

CONFIGURE_ARGS = --exec_prefix=/ CPPFLAGS=-I$(STAGING_INSTALL_PREFIX)/include LDFLAGS=-L$(STAGING_INSTALL_PREFIX)/lib
CONFIGURE_ARGS = --enable-static=no

include ../../mk/spksrc.cross-cc.mk

.PHONY: myInstall
# special-case the install for python3.5.5 avoiding breaking borgbackup (this
# logic says "is 'python3' in the path?" via "if I replace python3 with garbage,
# is it a different path?"
#
# note: borgbackup may also need install/install-* re-orderd: installer now
# fails if a depencent lib is not already installed
myInstall:
ifneq ($(subst python3,garbage,$(STAGING_DIR)),$(STAGING_DIR))
$(RUN) $(MAKE) DIST_ROOT=$(STAGING_INSTALL_PREFIX) LN_S=ln install-dev install-lib install
@echo fail fast
test -e $(STAGING_INSTALL_PREFIX)/lib/libacl.la*
test -f $(STAGING_INSTALL_PREFIX)/bin/chacl
else
$(RUN) $(MAKE) DIST_ROOT=$(INSTALL_DIR) install install-lib install-dev
endif
1 change: 0 additions & 1 deletion cross/acl/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
bin:bin/chacl
bin:bin/getfacl
bin:bin/setfacl
lnk:libexec/libacl.so
lnk:lib/libacl.so
lnk:lib/libacl.so.1
lib:lib/libacl.so.1.1.0
1 change: 1 addition & 0 deletions cross/attr/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ LICENSE = GPLv2+
PRE_CONFIGURE_TARGET = myPreConfigure
INSTALL_TARGET = myInstall
GNU_CONFIGURE = 1
CONFIGURE_ARGS = --enable-static=no


include ../../mk/spksrc.cross-cc.mk
Expand Down
1 change: 0 additions & 1 deletion cross/attr/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
bin:bin/attr
bin:bin/getfattr
bin:bin/setfattr
lnk:libexec/libattr.so
lnk:lib/libattr.so
lnk:lib/libattr.so.1
lib:lib/libattr.so.1.1.0
4 changes: 2 additions & 2 deletions cross/borgbackup/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
PKG_NAME = borgbackup
PKG_VERS = 1.1.5
PKG_VERS = 1.1.7
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/b/$(PKG_NAME)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/acl cross/openssl
DEPENDS = cross/attr cross/acl cross/openssl

HOMEPAGE = https://borgbackup.readthedocs.io/
COMMENT = Deduplicating backup program with compression and authenticated encryption
Expand Down
6 changes: 3 additions & 3 deletions cross/borgbackup/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
borgbackup-1.1.5.tar.gz SHA1 0dec8c69617eb5a3ea9a4d340df5116dd1d434ea
borgbackup-1.1.5.tar.gz SHA256 4356e6c712871f389e3cb1d6382e341ea635f9e5c65de1cd8fcd103d0fb66d3d
borgbackup-1.1.5.tar.gz MD5 38736d939d39fa0f5523b58dc3e135d5
borgbackup-1.1.7.tar.gz SHA1 d012b8fb55b01efe5840af86012ab7d5a6e346f5
borgbackup-1.1.7.tar.gz SHA256 f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc
borgbackup-1.1.7.tar.gz MD5 b45ac57fbf5566811e5a37e61d3a9d7c
2 changes: 1 addition & 1 deletion cross/msgpack-python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = msgpack-python
PKG_VERS = 0.4.8
PKG_VERS = 0.5.6
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/m/$(PKG_NAME)
Expand Down
6 changes: 3 additions & 3 deletions cross/msgpack-python/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
msgpack-python-0.4.8.tar.gz SHA1 59d4af5f0598bd31469cad7df316d70e6b492b1d
msgpack-python-0.4.8.tar.gz SHA256 1a2b19df0f03519ec7f19f826afb935b202d8979b0856c6fb3dc28955799f886
msgpack-python-0.4.8.tar.gz MD5 dcd854fb41ee7584ebbf35e049e6be98
msgpack-python-0.5.6.tar.gz SHA1 3522e33c8cd3c68d4cfedd9aa5defd177710da6a
msgpack-python-0.5.6.tar.gz SHA256 378cc8a6d3545b532dfd149da715abae4fda2a3adb6d74e525d0d5e51f46909b
msgpack-python-0.5.6.tar.gz MD5 6d644c06a87a5a111bbbf5b34b4be440
14 changes: 14 additions & 0 deletions cross/ruamel.yaml/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
PKG_NAME = ruamel.yaml
PKG_VERS = 0.15.78
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/r/$(PKG_NAME)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =

HOMEPAGE = https://bitbucket.org/ruamel/yaml
COMMENT = YAML 1.2 loader/dumper package for python
LICENSE = MIT

include ../../mk/spksrc.python-wheel.mk
Empty file added cross/ruamel.yaml/PLIST
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions cross/ruamel.yaml/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ruamel.yaml-0.15.78.tar.gz SHA1 3897a81d7016b82c93080cdddcd673cc255d9dcc
ruamel.yaml-0.15.78.tar.gz SHA256 85793c5fe321e9202eba521b0bb3e6303bcb61f6e56378f59e874ca36a7e9d5f
ruamel.yaml-0.15.78.tar.gz MD5 68f010d49987fc31c46e22951af7c845
10 changes: 5 additions & 5 deletions spk/borgbackup/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
SPK_NAME = borgbackup
SPK_VERS = 1.1.5
SPK_REV = 2
SPK_VERS = 1.1.7
SPK_REV = 3
SPK_ICON = src/$(SPK_NAME).png

BUILD_DEPENDS = cross/python3 cross/setuptools cross/pip cross/wheel
BUILD_DEPENDS += cross/$(SPK_NAME)
DEPENDS = cross/bash
DEPENDS = cross/bash cross/acl cross/attr
WHEELS = src/requirements.txt
SPK_DEPENDS = "python3>=3.5.2-6"
SPK_DEPENDS = "python3>=3.5.5-8"

MAINTAINER = SynoCommunity
DESCRIPTION = Deduplicating backup program with compression and authenticated encryption.
RELOAD_UI = no
DISPLAY_NAME = Borg
STARTABLE = no
CHANGELOG = Update to 1.1.5
CHANGELOG = Update to 1.1.7

HOMEPAGE = https://borgbackup.readthedocs.io
LICENSE = BSD-3-Clause
Expand Down
10 changes: 7 additions & 3 deletions spk/borgbackup/src/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Cross compiled packages dependencies
#borgbackup==1.1.5
#msgpack-python==0.4.8
#borgbackup==1.1.7
#msgpack-python==0.5.6
#ruamel.yaml==0.15.70

# Downloaded dependencies
borgmatic==1.0.3
borgmatic==1.2.2
pykwalify==1.6.1
docopt==0.6.2
python-dateutil==2.4.2
4 changes: 2 additions & 2 deletions spk/borgbackup/src/service-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ PATH="${SYNOPKG_PKGDEST}/env/bin:${SYNOPKG_PKGDEST}/bin:${PYTHON_DIR}/bin:${PATH
service_postinst ()
{
# Create a Python virtualenv
${VIRTUALENV} --system-site-packages ${SYNOPKG_PKGDEST}/env > /dev/null
${VIRTUALENV} --system-site-packages ${SYNOPKG_PKGDEST}/env >> ${INST_LOG}

# Install the wheels
${SYNOPKG_PKGDEST}/env/bin/pip install --no-deps --no-index -U --force-reinstall -f ${SYNOPKG_PKGDEST}/share/wheelhouse ${SYNOPKG_PKGDEST}/share/wheelhouse/*.whl > /dev/null 2>&1
${SYNOPKG_PKGDEST}/env/bin/pip install --no-deps --no-index -U --force-reinstall -f ${SYNOPKG_PKGDEST}/share/wheelhouse ${SYNOPKG_PKGDEST}/share/wheelhouse/*.whl >> ${INST_LOG} 2>&1

# Add symlink
mkdir -p /usr/local/bin
Expand Down
2 changes: 1 addition & 1 deletion spk/python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SPK_NAME = python
SPK_SHORT_VERS = 2.7
SPK_VERS = $(SPK_SHORT_VERS).14
SPK_REV = 19
SPK_REV = 20
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why updating Python 2.7? borgbackup runs on Python 3, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

borgbackup depends on python3, but I had to upgrade package msgpack-python that it is used by both python and python3 packages.

SPK_ICON = src/python.png

DEPENDS = cross/busybox cross/$(SPK_NAME)
Expand Down
2 changes: 1 addition & 1 deletion spk/python/src/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Included for reference
#lxml==3.7.2
#m2crypto==0.25.0
#msgpack-python==0.4.8
#msgpack-python==0.5.6
#pillow==4.0.0
#pyalsa==1.0.29
#pyaudio==0.2.9
Expand Down
4 changes: 2 additions & 2 deletions spk/python3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SPK_NAME = python3
SPK_SHORT_VERS = 3.5
SPK_VERS = $(SPK_SHORT_VERS).6
SPK_REV = 7
SPK_REV = 8
SPK_ICON = src/python3.png

DEPENDS = cross/busybox cross/$(SPK_NAME)
Expand All @@ -10,7 +10,7 @@ DEPENDS += cross/setuptools cross/pip cross/wheel
DEPENDS += cross/cffi cross/bcrypt cross/sqlite
# Cross-compiled wheels
DEPENDS += cross/lxml cross/pycrypto cross/pycurl cross/pyyaml
DEPENDS += cross/msgpack-python cross/attr cross/acl cross/lz4
DEPENDS += cross/msgpack-python cross/ruamel.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why removing attr, acl and lz4 from Python 3?
Isn't there any way to load ruamel.yaml (typically as borgbackup package specific wheel) instead of enforcing Python 3 publish (again) ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These have just been added for HomeAssistant in #3396
In fact Python 3 publishing is pending because of both HomeAssistant and Borgbackup.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know, attr, acl and lz4 are used by no other python3 dependent packages except for borgbackup.
I managed to put those dependencies inside borkgbackup package itself.
Better check with HomeAssistant spk maintainer, because in my eyes it looks those dependencies are not used.
About ruamel.yaml, I was not able to put it inside borgbackup package (any idea?).


WHEELS = src/requirements.txt

Expand Down