commit 92b36e4a14fdeba16fe4053923f00a7013f30382
parent 25271e534f40e054b3c6f9ba4e1e583d0399c886
Author: Gergely Kiss <mail.gery@gmail.com>
Date: Mon, 15 Dec 2014 22:13:08 +0100
seafile: fetch sources using commit hashes instead of release tags
Avoids source filename conflicts and the need to delete source packages
at the end of the prepare stage. This has forced the buildenv to rebuild
the packages even if they were built already.
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
Diffstat:
3 files changed, 18 insertions(+), 38 deletions(-)
diff --git a/net/seafile-ccnet/Makefile b/net/seafile-ccnet/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=seafile-ccnet
PKG_VERSION:=3.1.7
-PKG_RELEASE:=1
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_LICENSE:=GPL-3.0
-PKG_BUILD_DIR:=$(BUILD_DIR)/ccnet-$(PKG_VERSION)-server
-PKG_SOURCE:=v$(PKG_VERSION)-server.tar.gz
-PKG_SOURCE_URL:=https://github.com/haiwen/ccnet/archive/
-PKG_MD5SUM:=ed6d58bcce31d33847f536d129cfb404
-PKG_CAT:=zcat
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/haiwen/ccnet.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=ddf42784fab3b5924f65e648facd21c3bffa2c72
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
@@ -51,16 +51,9 @@ CONFIGURE_ARGS += --disable-client \
PKG_BUILD_DEPENDS:=vala/host \
libsearpc/host
-Hooks/Prepare/Post += delete_source_package
-
TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -liconv \
-L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -lz
-define delete_source_package
- # deleting downloaded source package as its filename is ambiguous
- rm -f $(DL_DIR)/$(PKG_SOURCE)
-endef
-
define Package/seafile-ccnet/install
$(INSTALL_DIR) $(1)/usr/{bin,lib}
$(INSTALL_DIR) $(1)/usr/lib/python2.7/site-packages
diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=seafile-seahub
PKG_VERSION:=3.1.7
-PKG_RELEASE:=1
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_LICENSE:=Apache-2.0
-PKG_BUILD_DIR:=$(BUILD_DIR)/seahub-$(PKG_VERSION)-server
-PKG_SOURCE:=v$(PKG_VERSION)-server.tar.gz
-PKG_SOURCE_URL:=https://github.com/haiwen/seahub/archive/
-PKG_MD5SUM:=d019b7171ed23817025cba55554b90d9
-PKG_CAT:=zcat
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/haiwen/seahub.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=a984c86442e7fc10c3bcf6d92b4843f7263547eb
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
include $(INCLUDE_DIR)/package.mk
@@ -37,12 +37,6 @@ define Package/seafile-seahub/description
endef
PKG_BUILD_DEPENDS:=python-setuptools
-Hooks/Prepare/Post += delete_source_package
-
-define delete_source_package
- # deleting downloaded source package as its filename is ambiguous
- rm -f $(DL_DIR)/$(PKG_SOURCE)
-endef
define Build/Configure
endef
diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=seafile-server
PKG_VERSION:=3.1.7
-PKG_RELEASE:=1
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_LICENSE:=GPL-3.0
-PKG_BUILD_DIR:=$(BUILD_DIR)/seafile-$(PKG_VERSION)-server
-PKG_SOURCE:=v$(PKG_VERSION)-server.tar.gz
-PKG_SOURCE_URL:=https://github.com/haiwen/seafile/archive/
-PKG_MD5SUM:=af35324998b6c98fe1442d5d775871ee
-PKG_CAT:=zcat
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/haiwen/seafile.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=69658fca88f258276be92447b1b4462b64a1c6b9
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
@@ -53,13 +53,6 @@ PKG_BUILD_DEPENDS:=vala/host \
TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -liconv \
-L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -lz
-Hooks/Prepare/Post += delete_source_package
-
-define delete_source_package
- # deleting downloaded source package as its filename is ambiguous
- rm -f $(DL_DIR)/$(PKG_SOURCE)
-endef
-
define Package/seafile-server/install
$(INSTALL_DIR) $(1)/usr/{bin,lib}
$(INSTALL_DIR) $(1)/usr/lib/python2.7/site-packages
