| Message ID | 1446927151-11562-2-git-send-email-countrysideboy@qq.com |
|---|---|
| State | Rejected |
| Headers | show |
Hi, On 07/11/2015 21:12, Shonn Lu wrote: > Signed-off-by: Shonn Lu <countrysideboy@qq.com> > --- > target/linux/oxnas/Makefile | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/target/linux/oxnas/Makefile b/target/linux/oxnas/Makefile > index 32bcab8..87b9489 100644 > --- a/target/linux/oxnas/Makefile > +++ b/target/linux/oxnas/Makefile > @@ -22,7 +22,8 @@ include $(INCLUDE_DIR)/target.mk > DEFAULT_PACKAGES += \ > kmod-ata-core kmod-ata-oxnas-sata kmod-button-hotplug \ > kmod-input-gpio-keys-polled kmod-leds-gpio kmod-usb2-oxnas \ > - uboot-envtools uboot-oxnas-ox820 > + uboot-envtools uboot-oxnas-ox820 \ > + dnsmasq iptables ip6tables ppp ppp-mod-pppoe kmod-nf-nathelper firewall odhcpd odhcp6c unfortunatley we cant merge this. if you look further up in this file you will see this line DEVICE_TYPE:=nas it overrides the default router package selection and only selects nas defaults. adding the router packages back this way would be the wrong approach. John > > KERNELNAME:=zImage dtbs > >
diff --git a/target/linux/oxnas/Makefile b/target/linux/oxnas/Makefile index 32bcab8..87b9489 100644 --- a/target/linux/oxnas/Makefile +++ b/target/linux/oxnas/Makefile @@ -22,7 +22,8 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ kmod-ata-core kmod-ata-oxnas-sata kmod-button-hotplug \ kmod-input-gpio-keys-polled kmod-leds-gpio kmod-usb2-oxnas \ - uboot-envtools uboot-oxnas-ox820 + uboot-envtools uboot-oxnas-ox820 \ + dnsmasq iptables ip6tables ppp ppp-mod-pppoe kmod-nf-nathelper firewall odhcpd odhcp6c KERNELNAME:=zImage dtbs
Signed-off-by: Shonn Lu <countrysideboy@qq.com> --- target/linux/oxnas/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)