diff --git a/sulu-builder/Makefile b/sulu-builder/Makefile index 68a17ff03..efa8e5cd8 100644 --- a/sulu-builder/Makefile +++ b/sulu-builder/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-builder -PKG_VERSION:=1.3.19 +PKG_VERSION:=1.3.20 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git -PKG_SOURCE_VERSION:=1c8eb27205f24bd4b05264e27d8811e014f3c732 +PKG_SOURCE_VERSION:=89d482571e3d79a1f6e6695947fae6cd55b1058c PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip @@ -40,7 +40,7 @@ define Download/sulu_core FILE:=$(SULU_DL_FILE) URL:=$(CONFIG_SULU_CORE_URL) PROTO:=git - SUBDIR:=core + SUBDIR:=sulu VERSION:=${CONFIG_SULU_CORE_VERSION} HASH:=skip endef @@ -139,6 +139,10 @@ ifeq ($(CONFIG_SULU_THEME_CUSTOM_ENABLE),y) endif endef +define Build/Compile + VERSION="v${PKG_VERSION}" $(MAKE) -C $(PKG_BUILD_DIR)/ +endef + define Package/${PKG_NAME}/install $(INSTALL_DIR) $(1)/sulu $(INSTALL_DIR) $(1)/sulu/config diff --git a/sulu/Makefile b/sulu/Makefile index afd0d975d..9bfb78454 100644 --- a/sulu/Makefile +++ b/sulu/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu -PKG_VERSION:=1.3.19 +PKG_VERSION:=1.3.20 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git -PKG_SOURCE_VERSION:=1c8eb27205f24bd4b05264e27d8811e014f3c732 +PKG_SOURCE_VERSION:=89d482571e3d79a1f6e6695947fae6cd55b1058c PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz