small fixes ; build lzo as default

diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index 79582a4f4c61965118722536d55febd71b13c5b6..babb5ddabdd649f790646becb5c2936a649ed485 100755 (executable)
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -24,6 +24,7 @@ bootstrap: $(BOOTSTRAP)
 
 SYSTEM_TOOLS  = $(D)/busybox
 SYSTEM_TOOLS += $(D)/zlib
+SYSTEM_TOOLS += $(D)/lzo
 SYSTEM_TOOLS += $(D)/e2fsprogs
 SYSTEM_TOOLS += $(D)/dosfstools
 SYSTEM_TOOLS += $(D)/exfat-utils

diff --git a/make/openvpn.mk b/make/openvpn.mk
index c77915d1c8bfdec66720e719f1ad1b1e7b29b36e..d5ee3d318ed4ab1e18053bb63ccbeaf50cfb2afb 100644 (file)
--- a/make/openvpn.mk
+++ b/make/openvpn.mk
@@ -37,5 +37,5 @@ $(D)/openvpn: $(D)/openssl $(D)/lzo $(ARCHIVE)/openvpn-$(OPENVPN_VER).tar.xz | $
        ln -sf openvpn $(OPENVPN_TARGET)/var/etc/init.d/S99openvpn
        ln -sf openvpn $(OPENVPN_TARGET)/var/etc/init.d/K05openvpn
        $(TARGET)-strip $(OPENVPN_TARGET)/sbin/*
-#      $(REMOVE)/openvpn-$(OPENVPN_VER)
+       $(REMOVE)/openvpn-$(OPENVPN_VER)
 #      $(TOUCH)

diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index aad07abe8f1fa0f8561ee46ba84060612456e61e..31f97471006347f2746692202788f0668fe4a215 100755 (executable)
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -125,7 +125,9 @@ $(GIT_KERNEL):
                        cd $(GIT_KERNEL)/linux-$(KBRANCH) && \
                        git checkout $(KBRANCH); \
                fi; \
-               #ln -sf $(GIT_KERNEL)/linux-$(KBRANCH) $(SOURCE_DIR)/linux; \
+               if [ "$(BOXSERIES)" = "hd1" ] || [ "$(BOXSERIES)" = "hd2" ]; then \
+                       ln -sf $(GIT_KERNEL)/linux-$(KBRANCH) $(SOURCE_DIR)/linux; \
+               fi; \
                if [ "$(BOXSERIES)" = "hd2" ]; then \
                        cp -a $(PATCHES)/kernel-config/compiler-gcc6.h $(GIT_KERNEL)/linux-$(KBRANCH)/include/linux; \
                fi