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

resolve conflicts

Conflicts:

	mk/pkg-bottom.mk
	package/ctorrent/Makefile
	package/gcc/Makefile
	package/gmp/Makefile
	package/id3lib/Makefile
	package/libelf/Makefile
	package/libnl/patches/patch-include_netlink-local_h
	package/mpd/Makefile
	package/nmap/Makefile
	package/rrs/Makefile
	package/weechat/Makefile
	scripts/rstrip.sh
	target/Config.in

7 files changed, 30 insertions, 22 deletions

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index cf0a9ba0e..94f756c8b 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,44 +9,52 @@ PKG_NAME:=		busybox
 PKG_VERSION:=		1.13.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		6f86b4aa466f4b492c9468ba9500976a
-MASTER_SITES:=		http://www.busybox.net/downloads/
+PKG_DESCR:=		Core utilities for embedded Linux systems
+PKG_SECTION:=		base
+PKG_URL:=		http://www.busybox.net
+PKG_SITES:=		http://www.busybox.net/downloads/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE)))
-
-#rebuild:
-#	@rm $(WRKBUILD)/.configure_done
+$(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 do-configure:
 	grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
 		${WRKBUILD}/.config
 	$(SED) 's
@IDIR@
${WRKINST}
' ${WRKBUILD}/.config
+ifeq ($(ADK_NATIVE),y)
+	yes '' | \
+	$(MAKE) V=1 \
+	    IPKG_ARCH="$(ARCH)" \
+	    ARCH="$(ARCH)" -C $(WRKBUILD) oldconfig
+else
 	yes '' | \
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 	    EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
 	    ARCH="$(ARCH)" -C $(WRKBUILD) oldconfig
+endif
 
 do-build:
+ifeq ($(ADK_NATIVE),y)
+	$(MAKE) V=1 \
+	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" -C $(WRKBUILD)
+else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" -C $(WRKBUILD)
+endif
 
 do-install: ${TOPDIR}/.config
+ifeq ($(ADK_NATIVE),y)
+	$(MAKE) V=1 \
+	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" -C $(WRKBUILD) install
+else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" -C $(WRKBUILD) install
+endif
 ifeq ($(DEBUG),1)
 	${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \
 		$(IDIR_BUSYBOX)/bin/busybox
 endif
 	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
-	$(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d/
-	$(INSTALL_BIN) ./files/syslog.init \
-		$(IDIR_BUSYBOX)/etc/init.d/syslog
-	$(INSTALL_BIN) ./files/network.init \
-		$(IDIR_BUSYBOX)/etc/init.d/network
-	$(INSTALL_BIN) ./files/crond.init \
-		$(IDIR_BUSYBOX)/etc/init.d/crond
-	${INSTALL_BIN} files/inetd.init \
-		${IDIR_BUSYBOX}/etc/init.d/inetd
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/busybox/ipkg/busybox.postinst b/package/busybox/files/busybox.postinst
index 97e83b766..97e83b766 100644
--- a/package/busybox/ipkg/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
diff --git a/package/busybox/files/crond.init b/package/busybox/files/crond.init
index c0b9da9e4..208479c6d 100644
--- a/package/busybox/files/crond.init
+++ b/package/busybox/files/crond.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG busybox
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/busybox/files/inetd.init b/package/busybox/files/inetd.init
index ad0527e6a..ff041aed4 100644
--- a/package/busybox/files/inetd.init
+++ b/package/busybox/files/inetd.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 41
+#PKG busybox
+#INIT 41
 . /etc/rc.conf
 case $1 in
 autostart)
diff --git a/package/busybox/files/network.init b/package/busybox/files/network.init
index 0f3d4edad..ee70efcbf 100644
--- a/package/busybox/files/network.init
+++ b/package/busybox/files/network.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 40
+#PKG busybox
+#INIT 40
 . /etc/rc.conf
 case $1 in
 autostart)
diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslog.init
index e06283480..9552dfe0a 100644
--- a/package/busybox/files/syslog.init
+++ b/package/busybox/files/syslog.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 05
+#PKG busybox
+#INIT 05
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/busybox/ipkg/busybox.control b/package/busybox/ipkg/busybox.control
deleted file mode 100644
index e7fc84a29..000000000
--- a/package/busybox/ipkg/busybox.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: busybox
-Priority: optional
-Section: net
-Description: Core utilities for embedded Linux systems