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

6 files changed, 192 insertions, 184 deletions

diff --git a/package/Config.in b/package/Config.in
index 378ec7c2a..68c81aad1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -6,6 +6,7 @@ menu "Package selection"
 menu "Basesystem"
 source "package/adkinstall/Config.in"
 source "package/base-files/Config.in"
+source "package/base-files/Config.in.manual"
 source "package/busybox/Config.in.manual"
 source "package/cfgfs/Config.in"
 source "package/cryptinit/Config.in"
@@ -64,6 +65,19 @@ source "package/strace/Config.in"
 source "package/valgrind/Config.in"
 endmenu
 
+menu "DNS / DHCP"
+source "package/atftp/Config.in"
+source "package/avahi/Config.in"
+source "package/bind/Config.in"
+source "package/dhcp/Config.in"
+source "package/dhcp-forwarder/Config.in"
+source "package/dnsmasq/Config.in"
+source "package/ez-ipupdate/Config.in"
+source "package/maradns/Config.in"
+source "package/pdnsd/Config.in"
+source "package/updatedd/Config.in"
+endmenu
+
 menu "Filesystem / Blockdevice utilities"
 source "package/aufs2-util/Config.in"
 source "package/dosfstools/Config.in"
@@ -79,133 +93,26 @@ source "package/wdfs/Config.in"
 source "package/xfsprogs/Config.in"
 endmenu
 
-menu "Mail"
-source "package/bogofilter/Config.in"
-source "package/dovecot/Config.in"
-source "package/fetchmail/Config.in"
-source "package/mini_sendmail/Config.in"
-source "package/mutt/Config.in"
-source "package/procmail/Config.in"
-source "package/ssmtp/Config.in"
-source "package/vilistextum/Config.in"
-endmenu
-
-menu "Misc"
-source "package/collectd/Config.in"
-source "package/deco/Config.in"
-source "package/dialog/Config.in"
-source "package/digitemp/Config.in"
-source "package/gpm/Config.in"
-source "package/gpsd/Config.in"
-source "package/logrotate/Config.in"
-source "package/mc/Config.in"
-source "package/mgetty/Config.in"
-source "package/monit/Config.in"
-source "package/motion/Config.in"
-source "package/osiris/Config.in"
-source "package/rrdtool/Config.in"
-source "package/rrdcollect/Config.in"
-source "package/sane-backends/Config.in"
-source "package/screen/Config.in"
-source "package/scsi-spin/Config.in"
-source "package/ser2net/Config.in"
-source "package/sqlite/Config.in"
-source "package/syslog-ng/Config.in"
-endmenu
-
-menu "Multimedia"
-source "package/alsa-utils/Config.in"
-source "package/esound/Config.in"
-source "package/ffmpeg/Config.in"
-source "package/gmediaserver/Config.in"
-source "package/icecast/Config.in"
-source "package/lame/Config.in"
-source "package/madplay/Config.in"
-source "package/mpg123/Config.in"
-source "package/moc/Config.in"
-source "package/mpd/Config.in"
-source "package/mplayer/Config.in"
-source "package/mt-daapd/Config.in"
-source "package/palantir/Config.in"
-source "package/setpwc/Config.in"
-endmenu
-
-menu "Shells"
-source "package/bash/Config.in"
-source "package/mksh/Config.in"
-source "package/tcsh/Config.in"
-source "package/zsh/Config.in"
-endmenu
-
-
-menu "Serial communications & terminal emulation"
-source "package/heyu/Config.in"
-source "package/lrzsz/Config.in"
-source "package/picocom/Config.in"
-source "package/serdisplib/Config.in"
-source "package/setserial/Config.in"
-endmenu
-
-menu "Telephony"
-source "package/asterisk/Config.in"
-source "package/opensips/Config.in"
-endmenu
-
-menu "Utilities"
-source "package/bc/Config.in"
-source "package/comgt/Config.in"
-source "package/cpufrequtils/Config.in"
-source "package/fbset/Config.in"
-source "package/file/Config.in"
-source "package/findutils/Config.in"
-source "package/hdparm/Config.in"
-source "package/usbutils/Config.in"
-source "package/patch/Config.in"
-source "package/pciutils/Config.in"
-source "package/procps/Config.in"
-source "package/sispmctl/Config.in"
-source "package/stress/Config.in"
-source "package/sysstat/Config.in"
-source "package/swconfig/Config.in"
-source "package/udev/Config.in"
-source "package/watchdog/Config.in"
-endmenu
-
-
-menu "Network - Analyze / Debugging / Monitoring"
-source "package/bwm/Config.in"
-source "package/dsniff/Config.in"
-source "package/ethtool/Config.in"
-source "package/fping/Config.in"
-source "package/fprobe/Config.in"
-source "package/fprobe-ulog/Config.in"
-source "package/httping/Config.in"
-source "package/iftop/Config.in"
-source "package/ipcad/Config.in"
-source "package/iperf/Config.in"
-source "package/iptraf/Config.in"
-source "package/mtr/Config.in"
-source "package/netperf/Config.in"
-source "package/nmap/Config.in"
-source "package/sipsak/Config.in"
-source "package/tcpdump/Config.in"
-source "package/tptest/Config.in"
-source "package/traceroute/Config.in"
-source "package/trafshow/Config.in"
-source "package/ttcp/Config.in"
-endmenu
-
-menu "DNS / DHCP"
-source "package/atftp/Config.in"
-source "package/avahi/Config.in"
-source "package/bind/Config.in"
-source "package/dhcp/Config.in"
-source "package/dhcp-forwarder/Config.in"
-source "package/dnsmasq/Config.in"
-source "package/ez-ipupdate/Config.in"
-source "package/maradns/Config.in"
-source "package/pdnsd/Config.in"
-source "package/updatedd/Config.in"
+menu "Firewall / Routing / Bridging"
+source "package/arpd/Config.in"
+source "package/bridge-utils/Config.in"
+source "package/linux-atm/Config.in"
+source "package/cutter/Config.in"
+source "package/ebtables/Config.in"
+source "package/ether-wake/Config.in"
+source "package/iproute2/Config.in"
+source "package/ipset/Config.in"
+source "package/iptables/Config.in"
+source "package/knock/Config.in"
+source "package/macchanger/Config.in"
+source "package/netstat-nat/Config.in"
+source "package/quagga/Config.in"
+source "package/ulogd/Config.in"
+source "package/shorewall-common/Config.in"
+source "package/shorewall-shell/Config.in"
+source "package/wol/Config.in"
+source "package/wondershaper/Config.in"
+source "package/vrrpd/Config.in"
 endmenu
 
 menu "HTTP / FTP"
@@ -237,28 +144,6 @@ source "package/reaim/Config.in"
 source "package/tmsnc/Config.in"
 endmenu
 
-menu "Firewall / Routing / Bridging"
-source "package/arpd/Config.in"
-source "package/bridge-utils/Config.in"
-source "package/linux-atm/Config.in"
-source "package/cutter/Config.in"
-source "package/ebtables/Config.in"
-source "package/ether-wake/Config.in"
-source "package/iproute2/Config.in"
-source "package/ipset/Config.in"
-source "package/iptables/Config.in"
-source "package/knock/Config.in"
-source "package/macchanger/Config.in"
-source "package/netstat-nat/Config.in"
-source "package/quagga/Config.in"
-source "package/ulogd/Config.in"
-source "package/shorewall-common/Config.in"
-source "package/shorewall-shell/Config.in"
-source "package/wol/Config.in"
-source "package/wondershaper/Config.in"
-source "package/vrrpd/Config.in"
-endmenu
-
 menu "Libraries"
 source "package/alsa-lib/Config.in"
 source "package/apr/Config.in"
@@ -441,6 +326,79 @@ source "package/ustl/Config.in"
 source "package/zlib/Config.in"
 endmenu
 
+menu "Mail"
+source "package/bogofilter/Config.in"
+source "package/dovecot/Config.in"
+source "package/fetchmail/Config.in"
+source "package/mini_sendmail/Config.in"
+source "package/mutt/Config.in"
+source "package/procmail/Config.in"
+source "package/ssmtp/Config.in"
+source "package/vilistextum/Config.in"
+endmenu
+
+menu "Misc"
+source "package/collectd/Config.in"
+source "package/deco/Config.in"
+source "package/dialog/Config.in"
+source "package/digitemp/Config.in"
+source "package/gpm/Config.in"
+source "package/gpsd/Config.in"
+source "package/logrotate/Config.in"
+source "package/mc/Config.in"
+source "package/mgetty/Config.in"
+source "package/monit/Config.in"
+source "package/motion/Config.in"
+source "package/osiris/Config.in"
+source "package/rrdtool/Config.in"
+source "package/rrdcollect/Config.in"
+source "package/sane-backends/Config.in"
+source "package/screen/Config.in"
+source "package/scsi-spin/Config.in"
+source "package/ser2net/Config.in"
+source "package/sqlite/Config.in"
+source "package/syslog-ng/Config.in"
+endmenu
+
+menu "Multimedia"
+source "package/alsa-utils/Config.in"
+source "package/esound/Config.in"
+source "package/ffmpeg/Config.in"
+source "package/gmediaserver/Config.in"
+source "package/icecast/Config.in"
+source "package/lame/Config.in"
+source "package/madplay/Config.in"
+source "package/mpg123/Config.in"
+source "package/moc/Config.in"
+source "package/mpd/Config.in"
+source "package/mplayer/Config.in"
+source "package/mt-daapd/Config.in"
+source "package/palantir/Config.in"
+source "package/setpwc/Config.in"
+endmenu
+
+menu "Network - Analyze / Debugging / Monitoring"
+source "package/bwm/Config.in"
+source "package/dsniff/Config.in"
+source "package/ethtool/Config.in"
+source "package/fping/Config.in"
+source "package/fprobe/Config.in"
+source "package/fprobe-ulog/Config.in"
+source "package/httping/Config.in"
+source "package/iftop/Config.in"
+source "package/ipcad/Config.in"
+source "package/iperf/Config.in"
+source "package/iptraf/Config.in"
+source "package/mtr/Config.in"
+source "package/netperf/Config.in"
+source "package/nmap/Config.in"
+source "package/sipsak/Config.in"
+source "package/tcpdump/Config.in"
+source "package/tptest/Config.in"
+source "package/traceroute/Config.in"
+source "package/trafshow/Config.in"
+source "package/ttcp/Config.in"
+endmenu
 
 menu "Networking Misc"
 source "package/cups/Config.in"
@@ -476,6 +434,28 @@ source "package/nfs-utils/Config.in"
 source "package/samba/Config.in"
 endmenu
 
+menu "Network Security"
+source "package/arpwatch/Config.in"
+source "package/autossh/Config.in"
+source "package/axtls/Config.in"
+source "package/ca-certificates/Config.in"
+source "package/dropbear/Config.in"
+source "package/httptunnel/Config.in"
+source "package/ipsec-tools/Config.in"
+source "package/l2tpns/Config.in"
+source "package/openssh/Config.in"
+source "package/openssh/Config.in.kerberos"
+source "package/openswan/Config.in"
+source "package/openvpn/Config.in"
+source "package/portsentry/Config.in"
+source "package/ptunnel/Config.in"
+source "package/scanlogd/Config.in"
+source "package/snort/Config.in"
+source "package/ssltunnel/Config.in"
+source "package/tinc/Config.in"
+source "package/vpnc/Config.in"
+endmenu
+
 menu "NTP"
 source "package/htpdate/Config.in"
 source "package/ntpclient/Config.in"
@@ -537,28 +517,6 @@ source "package/ruby/Config.in"
 source "package/tcl/Config.in"
 endmenu
 
-menu "Networking Security"
-source "package/arpwatch/Config.in"
-source "package/autossh/Config.in"
-source "package/axtls/Config.in"
-source "package/ca-certificates/Config.in"
-source "package/dropbear/Config.in"
-source "package/httptunnel/Config.in"
-source "package/ipsec-tools/Config.in"
-source "package/l2tpns/Config.in"
-source "package/openssh/Config.in"
-source "package/openssh/Config.in.kerberos"
-source "package/openswan/Config.in"
-source "package/openvpn/Config.in"
-source "package/portsentry/Config.in"
-source "package/ptunnel/Config.in"
-source "package/scanlogd/Config.in"
-source "package/snort/Config.in"
-source "package/ssltunnel/Config.in"
-source "package/tinc/Config.in"
-source "package/vpnc/Config.in"
-endmenu
-
 menu "SCM"
 #source "package/bzr/Config.in"
 source "package/cvs/Config.in"
@@ -566,6 +524,46 @@ source "package/git/Config.in"
 source "package/subversion/Config.in"
 endmenu
 
+menu "Shells"
+source "package/bash/Config.in"
+source "package/mksh/Config.in"
+source "package/tcsh/Config.in"
+source "package/zsh/Config.in"
+endmenu
+
+menu "Serial communications & terminal emulation"
+source "package/heyu/Config.in"
+source "package/lrzsz/Config.in"
+source "package/picocom/Config.in"
+source "package/serdisplib/Config.in"
+source "package/setserial/Config.in"
+endmenu
+
+menu "Telephony"
+source "package/asterisk/Config.in"
+source "package/opensips/Config.in"
+endmenu
+
+menu "Utilities"
+source "package/bc/Config.in"
+source "package/comgt/Config.in"
+source "package/cpufrequtils/Config.in"
+source "package/fbset/Config.in"
+source "package/file/Config.in"
+source "package/findutils/Config.in"
+source "package/hdparm/Config.in"
+source "package/usbutils/Config.in"
+source "package/patch/Config.in"
+source "package/pciutils/Config.in"
+source "package/procps/Config.in"
+source "package/sispmctl/Config.in"
+source "package/stress/Config.in"
+source "package/sysstat/Config.in"
+source "package/swconfig/Config.in"
+source "package/udev/Config.in"
+source "package/watchdog/Config.in"
+endmenu
+
 menu "Wireless"
 source "package/aircrack-ng/Config.in"
 source "package/chillispot/Config.in"
@@ -579,8 +577,7 @@ source "package/wifidog/Config.in"
 source "package/wpa_supplicant/Config.in"
 endmenu
 
-
-menu "Xorg server and drivers"
+menu "X server and drivers"
 source "package/xorg-server/Config.in"
 source "package/xf86-video-cirrus/Config.in"
 source "package/xf86-video-geode/Config.in"
@@ -589,7 +586,7 @@ source "package/xf86-input-keyboard/Config.in"
 source "package/xf86-input-evtouch/Config.in"
 endmenu
 
-menu "X Applications"
+menu "X applications"
 source "package/evilwm/Config.in"
 source "package/font-util/Config.in"
 source "package/rxvt-unicode/Config.in"
@@ -597,7 +594,7 @@ source "package/xauth/Config.in"
 source "package/xlsfonts/Config.in"
 endmenu
 
-menu "X Fonts"
+menu "X fonts"
 source "package/font-adobe-75dpi/Config.in"
 source "package/font-adobe-100dpi/Config.in"
 source "package/font-bitstream-75dpi/Config.in"
@@ -613,7 +610,7 @@ source "package/font-misc-misc/Config.in"
 source "package/font-xfree86-type1/Config.in"
 endmenu
 
-menu "X Libraries"
+menu "X libraries"
 source "package/libICE/Config.in"
 source "package/libICE/Config.in.lib"
 source "package/libSM/Config.in"
@@ -651,7 +648,6 @@ source "package/libXft/Config.in.lib"
 source "package/libXxf86dga/Config.in"
 source "package/libXxf86dga/Config.in.lib"
 source "package/pixman/Config.in"
-#source "package/xf86dga/Config.in"
 source "package/xkbcomp/Config.in"
 source "package/xkeyboard-config/Config.in"
 endmenu
@@ -660,4 +656,3 @@ endmenu
 menu "Kernel configuration"
 source "target/linux/Config.in"
 endmenu
-
diff --git a/package/base-files/Config.in.manual b/package/base-files/Config.in.manual
new file mode 100644
index 000000000..d750ff3ef
--- /dev/null
+++ b/package/base-files/Config.in.manual
@@ -0,0 +1,10 @@
+config ADK_PACKAGE_CONFIG_IN_ETC
+	prompt ".config in /etc.................. include buildsystem configuration in image"
+	bool
+	depends on ADK_PACKAGE_BASE_FILES
+	default y if !ADK_TOOLCHAIN_ONLY
+	help
+         Copy the configuration file (.config) to the image.  The
+         file will be found in /etc/adkconfig.gz. This takes about
+         7kBytes of file system space. From this file you can always rebuild
+         the image from source.
diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index 0366fa2ef..c9298e15d 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -15,6 +15,8 @@ NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
@@ -35,5 +37,6 @@ do-build:
 do-install:
 	$(CP) ./files/initramfs_list $(LINUX_DIR)
 	$(CP) ${WRKBUILD}/cryptinit $(LINUX_DIR)
+	@touch ${IDIR_CRYPTINIT}/.empty
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 932871dcf..5c3c76899 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -73,13 +73,13 @@ eglibc-dev-install:
 	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libcrypt.so.1 libcrypt.so
 	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
 		${EGLIBC_ENV} \
-		$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/libc/configure \
+		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/libc/configure \
 			--prefix=$(IDIR_EGLIBC_DEV)/usr \
 			--with-headers=$(IDIR_EGLIBC_DEV)/usr/include \
 			${EGLIBC_CONFOPTS} \
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index ddda531a9..084a71918 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -57,12 +57,12 @@ glibc-dev-install:
 	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
 	${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
-		$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/configure \
+		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/configure \
 		--prefix=/usr \
 		--with-sysroot=$(IDIR_GLIBC_DEV) \
 		${GLIBC_CONFOPTS} \
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index aeffb3563..787dc4e56 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -41,10 +41,10 @@ uclibc-dev-install:
 	${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib
 	${CP} ${STAGING_DIR}/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
 		headers_install
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/${PKG_NAME}-${PKG_VERSION} \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
 		PREFIX=$(IDIR_UCLIBC_DEV)/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(IDIR_UCLIBC_DEV)/ \