Bump version to v1.3.3 and updated cjdns

diff --git a/trunk/include/version.mk b/trunk/include/version.mk
index b5a71c1183c01ff7c3a11573e75fd930def66284..eb95c959a7db9fc2e25e886ae90b064e4a6e39b0 100644 (file)
--- a/trunk/include/version.mk
+++ b/trunk/include/version.mk
@@ -21,7 +21,7 @@ qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
 #'
 
 VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),1.3.2)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),1.3.3)
 
 VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
 VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Elegant Eleanor)

diff --git a/trunk/package/network/feeds/cjdns/Makefile b/trunk/package/network/feeds/cjdns/Makefile
index dbf1c21f1b9ba17bac6bf7a0896cfd960b0af1e3..9acc3cccd6119423d1115d5a7358c44c6db8a266 100644 (file)
--- a/trunk/package/network/feeds/cjdns/Makefile
+++ b/trunk/package/network/feeds/cjdns/Makefile
@@ -18,11 +18,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=0.16
-PKG_RELEASE:=14
+PKG_RELEASE:=16
 
 PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a97c189b9181bf83ed44a9ab0ebc817882c60ffa
+PKG_SOURCE_VERSION:=b2484c8c1a695a103db9e75b7b4445252ff053d6
 PKG_LICENSE:=GPL-3.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
@@ -49,6 +49,20 @@ define Package/cjdns/description
        of the security and scalability issues that plague existing networks.
 endef
 
+define Package/cjdns-tests
+       SECTION:=net
+       CATEGORY:=Network
+       SUBMENU:=Routing and Redirection
+       TITLE:=cjdns test cases
+       URL:=https://github.com/hyperboria/cjdns
+       MAINTAINER:=Lars Gierth <larsg@systemli.org>
+       DEPENDS:=+libpthread +librt
+endef
+
+define Package/cjdns-test/description
+       cjdns test cases
+endef
+
 define Build/Configure
 endef
 
@@ -65,11 +79,14 @@ endif
 define Build/Compile
        CROSS="true" \
        CC="$(TARGET_CC)" \
+       AR="$(TARGET_AR)" \
+       RANLIB="$(TARGET_RANLIB)" \
        CFLAGS="$(TARGET_CFLAGS)" \
        LDFLAGS="$(TARGET_LDFLAGS)" \
        SYSTEM="linux" \
        TARGET_ARCH="$(CONFIG_ARCH)" \
        SSP_SUPPORT="$(CONFIG_SSP_SUPPORT)" \
+       GYP_ADDITIONAL_ARGS="-f make-linux" \
        $(PKG_DO_VARS) \
        $(PKG_BUILD_DIR)/do
 endef
@@ -118,4 +135,12 @@ if [ -z $${IPKG_INSTROOT} ] ; then
 fi
 endef
 
+define Package/cjdns-tests/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) \
+               $(PKG_BUILD_DIR)/build_linux/test_testcjdroute_c \
+               $(1)/usr/bin
+endef
+
 $(eval $(call BuildPackage,cjdns))
+$(eval $(call BuildPackage,cjdns-tests))

diff --git a/trunk/target/linux/ar71xx/luci/profiles/thinkpenguin.mk b/trunk/target/linux/ar71xx/luci/profiles/thinkpenguin.mk
index bb7099bdb256f86a7e4765c6fea5ec69a6f17406..84651030d772a9ac3db8ac8dbbaaa15c5fd3f8ae 100644 (file)
--- a/trunk/target/linux/ar71xx/luci/profiles/thinkpenguin.mk
+++ b/trunk/target/linux/ar71xx/luci/profiles/thinkpenguin.mk
@@ -8,7 +8,7 @@
 
 define Profile/TPE-R1100
        NAME:=TPE-R1100
-       PACKAGES:=luci luci-ssl kmod-usb-core kmod-usb2
+       PACKAGES:=luci luci-ssl kmod-usb-core kmod-usb2 mod-usb-storage mod-usb-storage-extras
 endef
 
 define Profile/TPE-R1100/Description
@@ -17,6 +17,7 @@ endef
 
 $(eval $(call Profile,TPE-R1100))
 
+
 define Profile/TPE-R3300
         NAME:=TPE-R3300
         PACKAGES:=luci luci-ssl kmod-usb-core kmod-usb2

diff --git a/trunk/tools/mkimage/Makefile b/trunk/tools/mkimage/Makefile
index f33bbe965cb763babf1cd4bf9b3fd4fbdd12bad7..1356b5023e430fa3e2530d3b3b8214d32390a1c6 100644 (file)
--- a/trunk/tools/mkimage/Makefile
+++ b/trunk/tools/mkimage/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mkimage
-PKG_VERSION:=2014.10
+PKG_VERSION:=2014.10-librecmc
 
 PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=\
-       http://mirror2.librecmc.org/sources \
-       ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=3ddcaee2f05b7c464778112ec83664b5
+       http://downloads.librecmc.org/sources \
+
+PKG_MD5SUM:=a4d242902687a4ee46fe8dabb5c0f12e
 PKG_CAT:=bzcat
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)