From b900deae8124295cc974c8e7188a86990079d4e9 Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Sun, 26 Nov 2017 13:20:28 -0500 Subject: [PATCH] Bump version to v1.4.2 and add small-router cat. --- feeds.conf.default | 2 +- include/target.mk | 9 +++++++-- include/version.mk | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/feeds.conf.default b/feeds.conf.default index 3089940cc3..9d5526aa16 100644 --- 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 30994485e1..e65c5884a5 100644 --- 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 30bceb4e4a..dc5321117c 100644 --- 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)) -- 2.25.1