Skip to contentSkip to conversation

Added new package - rdiff-backup.

PATCH New Avishay Orpaz 2 participants 2 messages Aug 12, 2012

lore
Share & tools
lore

Avishay Orpaz

author
#0 lore raw

PATCH 1/1 Added new package - rdiff-backup.

Signed-off-by Avishay Orpaz <[email protected]>
---
 package/Config.in                    |    1 +
 package/python/Config.in             |    6 ++++++
 package/python/python.mk             |    4 ++++
 package/rdiff-backup/Config.in       |   10 ++++++++++
 package/rdiff-backup/rdiff-backup.mk |   28 ++++++++++++++++++++++++++++
 5 files changed, 49 insertions(+), 0 deletions(-)
 create mode 100644 package/rdiff-backup/Config.in
 create mode 100644 package/rdiff-backup/rdiff-backup.mk
package/Config.in +1 -0
index f308de7..1e4d7a1 100644
@@ -503,6 +503,7 @@ source "package/mobile-broadband-provider-info/Config.in"
 source "package/shared-mime-info/Config.in"
 source "package/sound-theme-borealis/Config.in"
 source "package/sound-theme-freedesktop/Config.in"
+source "package/rdiff-backup/Config.in"
 endmenu
 
 menu "Networking applications"
package/python/Config.in +6 -0
index 11aa267..65aac23 100644
@@ -93,6 +93,12 @@ config BR2_PACKAGE_PYTHON_ZLIB
 	help
 	  zlib support in Python
 
+config BR2_PACKAGE_PYTHON_HASHLIB
+	bool "hashlib module"
+	select BR2_PACKAGE_OPENSSL
+	help
+	  hashlib support in Python
+
 endmenu
 
 endif
package/python/python.mk +4 -0
index fae4e5c..0584a5a 100644
@@ -110,6 +110,10 @@ else
 PYTHON_CONF_OPT += --disable-zlib
 endif
 
+ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y)
+PYTHON_DEPENDENCIES += openssl
+endif
+
 PYTHON_CONF_ENV += \
 	PYTHON_FOR_BUILD=$(HOST_PYTHON_DIR)/python \
 	PGEN_FOR_BUILD=$(HOST_PYTHON_DIR)/Parser/pgen \
package/rdiff-backup/Config.in new file +10 -0
new file mode 100644
index 0000000..1e8bc27
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_RDIFF_BACKUP
+    bool "rdiff-backup"
+    depends on BR2_PACKAGE_PYTHON
+    select BR2_PACKAGE_PYTHON_HASHLIB
+    select BR2_PACKAGE_PYTHON_ZLIB
+    help
+      Tool for incremental, network efficient backup
+
+      http://nongnu.org/rdiff-backup
+
package/rdiff-backup/rdiff-backup.mk new file +28 -0
new file mode 100644
index 0000000..77d9caf
@@ -0,0 +1,28 @@
+#############################################################
+#
+# rdiff-backup
+#
+#############################################################
+
+RDIFF_BACKUP_VERSION = 1.2.8
+RDIFF_BACKUP_SOURCE = rdiff-backup-$(RDIFF_BACKUP_VERSION).tar.gz
+RDIFF_BACKUP_SITE = http://savannah.nongnu.org/download/rdiff-backup
+
+RDIFF_BACKUP_DEPENDENCIES = python librsync
+
+define RDIFF_BACKUP_BUILD_CMDS
+	(cd $(@D); \
+		CC="$(TARGET_CC)"		\
+		CFLAGS="$(TARGET_CFLAGS)" 	\
+		LDSHARED="$(TARGET_CC) -shared" \
+		LDFLAGS="$(TARGET_LDFLAGS)" 	\
+	$(HOST_DIR)/usr/bin/python setup.py build_ext \
+	--include-dirs=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR))
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build -e /usr/bin/python )
+endef
+
+define RDIFF_BACKUP_INSTALL_TARGET_CMDS
+    (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(generic-package))
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 Added new package - rdiff-backup.

Hello!

Thanks for this contribution!

Le Sun, 12 Aug 2012 16:18:29 +0300,
Avishay Orpaz <[email protected]> a ?crit :

Quoted 7 lines
Signed-off-by Avishay Orpaz <[email protected]>
---
 package/Config.in                    |    1 +
 package/python/Config.in             |    6 ++++++
 package/python/python.mk             |    4 ++++
 package/rdiff-backup/Config.in       |   10 ++++++++++
 package/rdiff-backup/rdiff-backup.mk |   28 ++++++++++++++++++++++++++++

The python package changes and the new rdiff-backup package should be two separate patches.

package/python/python.mk else · line 115

Quoted 11 lines
package/python/python.mk +3 -0
index fae4e5c..0584a5a 100644
@@ -110,6 +110,10 @@ else
 PYTHON_CONF_OPT += --disable-zlib
 endif
 
+ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y)
+PYTHON_DEPENDENCIES += openssl
+endif

Is it enough to just have openssl in the dependencies to get hashlib support in Python? How does this interact with the existing BR2_PACKAGE_PYTHON_SSL option? Maybe a new patch that makes hashlib support optional through --enable/--disable options should be added.

Quoted 5 lines

new file mode 100644
index 0000000..77d9caf

package/rdiff-backup/rdiff-backup.mk line 9

Quoted 9 lines
package/rdiff-backup/rdiff-backup.mk new file +9 -0
@@ -0,0 +1,28 @@
+#############################################################
+#
+# rdiff-backup
+#
+#############################################################
+
+RDIFF_BACKUP_VERSION = 1.2.8
+RDIFF_BACKUP_SOURCE = rdiff-backup-$(RDIFF_BACKUP_VERSION).tar.gz
+RDIFF_BACKUP_SITE = http://savannah.nongnu.org/download/rdiff-backup

Can you try adding the license information as well?

package/rdiff-backup/rdiff-backup.mk line 21

Quoted 11 lines
package/rdiff-backup/rdiff-backup.mk new file +11 -0
+RDIFF_BACKUP_DEPENDENCIES = python librsync
+
+define RDIFF_BACKUP_BUILD_CMDS
+	(cd $(@D); \
+		CC="$(TARGET_CC)"		\
+		CFLAGS="$(TARGET_CFLAGS)" 	\
+		LDSHARED="$(TARGET_CC) -shared" \
+		LDFLAGS="$(TARGET_LDFLAGS)" 	\
+	$(HOST_DIR)/usr/bin/python setup.py build_ext \
+	--include-dirs=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR))
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build -e /usr/bin/python )

There is no way to do everything in a single "setup.py build" call?

Otherwise, looks good to me.

Thanks!

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com