Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/bind/Makefile

@@ -18,22 +18,22 @@ PKG_NEED_CXX:=		1
 PKG_SUBPKGS:=		BIND_SERVER BIND_NSUPDATE BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG LIBBIND
 PKGSD_BIND_NSUPDATE:=	nsupdate utility
 PKGSC_BIND_NSUPDATE:=	dns
-PKGSS_BIND_NSUPDATE:=	libbind
+PKGSS_BIND_NSUPDATE:=	libbind libopenssl libxml2
 PKGSD_BIND_RNDC:=	rndc & rndc-confgen utilities
 PKGSC_BIND_RNDC:=	dns
-PKGSS_BIND_RNDC:=	libbind
+PKGSS_BIND_RNDC:=	libbind libopenssl libxml2
 PKGSD_BIND_CHECK:=	check utilities
 PKGSC_BIND_CHECK:=	dns
-PKGSS_BIND_CHECK:=	libbind
+PKGSS_BIND_CHECK:=	libbind libopenssl libxml2
 PKGSD_BIND_DNSSEC:=	dnssec utilities
 PKGSC_BIND_DNSSEC:=	dns
-PKGSS_BIND_DNSSEC:=	libbind
+PKGSS_BIND_DNSSEC:=	libbind libopenssl libxml2
 PKGSD_BIND_HOST:=	host utility
 PKGSC_BIND_HOST:=	dns
-PKGSS_BIND_HOST:=	libbind
+PKGSS_BIND_HOST:=	libbind libopenssl libxml2
 PKGSD_BIND_DIG:=	dig utility
 PKGSC_BIND_DIG:=	dns
-PKGSS_BIND_DIG:=	libbind
+PKGSS_BIND_DIG:=	libbind libopenssl libxml2
 PKGSD_LIBBIND:=		library for the bind software suite
 PKGSC_LIBBIND:=		libs
 

rules.mk

@@ -48,10 +48,14 @@ include $(TOPDIR)/target/$(ADK_TARGET_ARCH)/target.mk
 endif
 endif
 
-include $(TOPDIR)/mk/vars.mk
+ifneq (${DEBUG},)
+ADK_DEBUG:=y
+endif
+ifneq (${STATIC},)
+ADK_STATIC:=y
+endif
 
-# needed? 
-#export BASH MAKE LANGUAGE LC_ALL OStype PATH
+include $(TOPDIR)/mk/vars.mk
 
 CPPFLAGS_FOR_BUILD?=
 CFLAGS_FOR_BUILD?=	-O2 -Wall

target/mips/Makefile

@@ -57,6 +57,10 @@ ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB433),y)
 kernel-install:
 	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel
 endif
+ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y)
+kernel-install:
+	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel
+endif
 
 ifeq ($(ADK_TARGET_FS),nfsroot)
 imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL)