projects / librecmc / librecmc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b0f5d5f)
Bump version to v1.4.2 and add small-router cat.
authorRISCi_ATOM <bob@bobcall.me>
Sun, 26 Nov 2017 18:20:28 +0000 (13:20 -0500)
committerRISCi_ATOM <bob@bobcall.me>
Sun, 26 Nov 2017 18:20:28 +0000 (13:20 -0500)
feeds.conf.default patch | blob | history
include/target.mk patch | blob | history
include/version.mk patch | blob | history

diff --git a/feeds.conf.default b/feeds.conf.default
index 3089940cc3d3e8776e7c317175bb3ca7bc5e7026..9d5526aa16993edb5738a1526d9496b3af40a3c3 100644 (file)
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1 +1 @@
-src-git packages https://gogs.librecmc.org/libreCMC/package-feed.git;v1.4
+src-git packages https://gogs.librecmc.org/libreCMC/package-feed.git;v1.4.2
diff --git a/include/target.mk b/include/target.mk
index 30994485e183c16d052614aa00b5046e58e5e9ae..e65c5884a5f589d6b0201ed7a660579d7fb6c3b4 100644 (file)
--- a/include/target.mk
+++ b/include/target.mk
@@ -13,13 +13,18 @@ __target_inc=1
 DEVICE_TYPE?=router
 
 # Default packages - the really basic set
-DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd
+DEFAULT_PACKAGES:=base-files ca-bundle libmbedtls libustream-mbedtls libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd
+
 # For nas targets
 DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm
+
 # For router targets
-DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe firewall odhcpd odhcp6c
+DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe ppp-mod-pppoa firewall odhcpd odhcp6c
 DEFAULT_PACKAGES.bootloader:=
 
+# Small Router Targets
+DEFAULT_PACKAGES.small-router:=-ca-bundle -opkg -libmbedtls -libustream-mbedtls
+
 ifneq ($(DUMP),)
   all: dumpinfo
 endif
diff --git a/include/version.mk b/include/version.mk
index 30bceb4e4adfb5b5b085078fa70383b548b90edb..dc5321117c36d8d12adcf29a6743be299714cd98 100644 (file)
--- a/include/version.mk
+++ b/include/version.mk
@@ -31,7 +31,7 @@ qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),v1.4.1)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),v1.4.2)
 
 VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE))
 VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))