Browse Source

Bump version to v1.4.2 and add small-router cat.

RISCi_ATOM 2 years ago
parent
commit
b900deae81
3 changed files with 9 additions and 4 deletions
  1. 1 1
      feeds.conf.default
  2. 7 2
      include/target.mk
  3. 1 1
      include/version.mk

+ 1 - 1
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

+ 7 - 2
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

+ 1 - 1
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))