create core package section, cleanup old installer stuff

28 files changed, 51 insertions, 947 deletions

diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile
deleted file mode 100644
index 9d5d74cfd..000000000
--- a/package/adkinstall/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		adkinstall
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		10
-PKG_DESCR:=		openadk installer
-PKG_SECTION:=		base
-PKG_DEPENDS:=		parted sfdisk mke2fs
-PKG_URL:=		http://openadk.org/
-
-PKG_ARCH_DEPENDS:=	!m68k
-
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
-NO_DISTFILES:=		1
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,ADKINSTALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-pre-configure:
-	mkdir -p ${WRKBUILD}
-
-do-install:
-	${INSTALL_DIR} $(IDIR_ADKINSTALL)/sbin
-ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
-	${INSTALL_BIN} ./src/adkinstall.rb532 \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y)
-	${INSTALL_BIN} ./src/adkinstall.foxg20 \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
-	${INSTALL_BIN} ./src/adkinstall.yeelong \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB4XX),y)
-	${INSTALL_BIN} ./src/adkinstall.rb4xx \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else
-	${INSTALL_BIN} ./src/adkinstall $(IDIR_ADKINSTALL)/sbin
-endif
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/adkinstall/src/adkinstall b/package/adkinstall/src/adkinstall
deleted file mode 100644
index 2f14d0b96..000000000
--- a/package/adkinstall/src/adkinstall
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a Compact Flash disk
-
-check_exit() {
-        if [ $? -ne 0 ];then
-                echo "Installation failed."
-                exit 1
-        fi
-}
-
-rescue=0
-while getopts "r" option
-do
-	case $option in
-		r)
-			rescue=1
-			;;
-		*)
-			printf "Option not recognized\n"
-			exit 1
-			;;
-	esac
-done
-shift $(($OPTIND - 1))
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-if [ $rescue -eq 1 ];then
-	if [ -z $2 ];then
-		printf "Please give your rescue kernel image as second parameter\n"
-		exit 2
-	fi
-	if [ ! -f $2 ];then
-		printf "$2 is not a file, Exiting.\n"
-		exit 1
-	fi
-fi
-
-printf "Creating partitions ...\n"
-parted -s /dev/sda mklabel msdos
-check_exit
-sleep 2
-maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-2))
-start=0
-rootp=1
-cfgfsp=2
-if [ $rescue -eq 1 ];then
-	rootp=3
-	cfgfsp=4
-	start=2
-	parted -s /dev/sda unit cyl mkpart primary ext2 0 1
-	check_exit
-	mke2fs -q /dev/sda1
-	check_exit
-	parted -s /dev/sda unit cyl mkpart primary ext2 1 2
-	check_exit
-	mke2fs -q /dev/sda2
-	check_exit
-fi
-parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize
-check_exit
-mke2fs -q /dev/sda1
-check_exit
-parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
-check_exit
-parted -s /dev/sda set $rootp boot on
-check_exit
-sfdisk --change-id /dev/sda $cfgfsp 88 >/dev/null 2>&1
-check_exit
-# settle down
-sleep 2
-mount -t ext2 /dev/sda$rootp /mnt
-check_exit
-printf "Extracting install archive ...\n"
-tar -C /mnt -xzpf $1
-check_exit
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-if [ $rescue -eq 1 ];then
-	mkdir /mnt/boot/grub
-fi
-
-speed=$(awk -F \, '/console=ttyS0/ { print $2 }' /proc/cmdline|sed -e "s/ .*$//")
-
-if [ $rescue -eq 1 ];then
-	umount /mnt
-	mount /dev/sda2 /mnt
-	cp $2 /mnt/rescue
-fi
-printf "Installing bootloader ...\n"
-mkdir -p /mnt/boot/grub
-if [ $rescue -eq 1 ];then
-mount /dev/sda1 /mnt/boot/grub
-cat << EOF > /mnt/boot/grub/grub.cfg
-set timeout=1
-serial --unit=0 --speed=$speed
-terminal_output serial 
-terminal_input serial 
-
-if [ -s \$prefix/grubenv ]; then
-  load_env
-fi
-
-set default="\${saved_entry}"
-
-if [ \${prev_saved_entry} ]; then
-  set saved_entry=\${prev_saved_entry}
-  save_env saved_entry
-  set prev_saved_entry=
-  save_env prev_saved_entry
-  set boot_once=true
-fi
-
-function savedefault {
-  if [ -z \${boot_once} ]; then
-    saved_entry=\${chosen}
-    save_env saved_entry
-  fi
-}
-
-function recordfail {
-  set recordfail=1
-  if [ -n \${have_grubenv} ]; then if [ -z \${boot_once} ]; then save_env recordfail; fi; fi
-}
-
-menuentry "GNU/Linux (OpenADK)" {
-	recordfail
-        insmod ext2
-        set root=(hd0,3)
-        linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10
-}
-
-menuentry "GNU/Linux (OpenADK) Rescue Mode" {
-	recordfail
-        insmod ext2
-        set root=(hd0,2)
-        linux /rescue ro init=/init panic=10
-}
-EOF
-else
-cat << EOF > /mnt/boot/grub/grub.cfg
-set default=0
-set timeout=1
-serial --unit=0 --speed=$speed
-terminal_output serial 
-terminal_input serial 
-
-menuentry "GNU/Linux (OpenADK)" {
-        insmod ext2
-        set root=(hd0,1)
-        linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10
-}
-EOF
-fi
-grub-install --root-directory=/mnt /dev/sda 
-check_exit
-if [ $rescue -eq 1 ];then
-	grub-set-default --root-directory=/mnt 0
-	umount /mnt/boot/grub
-fi
-umount /mnt
-printf "Successfully installed. You can reboot now.\n"
-exit 0
diff --git a/package/adkinstall/src/adkinstall.foxg20 b/package/adkinstall/src/adkinstall.foxg20
deleted file mode 100644
index 99cd899f4..000000000
--- a/package/adkinstall/src/adkinstall.foxg20
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a micro SD card
-# special script for foxboard netus aka foxg20
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-if [ ! -f $1 ];then
-	printf "given root tar archive does not exist\n"
-	exit 1
-fi
-
-printf "Creating partition scheme\n"
-parted -s /dev/mmcblk0 mklabel msdos
-sleep 2
-maxsize=$(env LC_ALL=C parted /dev/mmcblk0 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-2))
-parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 0 5
-parted -s /dev/mmcblk0 unit cyl mkpart primary ext2 5 $rootsize
-parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 $rootsize $maxsize
-parted -s /dev/mmcblk0 set 1 boot on
-sfdisk --change-id /dev/mmcblk0 3 88 >/dev/null 2>&1
-sleep 2
-sync
-printf "Creating vfat filesystem\n"
-mkfs.vfat /dev/mmcblk0p1 >/dev/null 2>&1
-printf "Creating ext2 filesystem\n"
-mke2fs /dev/mmcblk0p2 >/dev/null 2>&1
-tune2fs -c0 -i0 /dev/mmcblk0p2 >/dev/null 2>&1
-mount -t ext2 /dev/mmcblk0p2 /mnt
-mkdir /mnt/boot
-mount -t vfat /dev/mmcblk0p1 /mnt/boot
-
-printf "Extracting install archive\n"
-tar -C /mnt -xzpf $1
-if [ $? -ne 0 ];then
-	printf "Extracting of install archive failed"
-	exit 1
-fi
-
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-sync
-umount /mnt/boot
-umount /mnt
-if [ $? -ne 0 ];then
-	printf "Unmounting filesystem failed"
-	exit 1
-else
-	printf "Successfully installed.\n"
-	exit 0
-fi
diff --git a/package/adkinstall/src/adkinstall.rb4xx b/package/adkinstall/src/adkinstall.rb4xx
deleted file mode 100644
index afaea0c39..000000000
--- a/package/adkinstall/src/adkinstall.rb4xx
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a NAND device
-# special script for routerboard rb4xx
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-printf "Preparing mountpoints\n"
-mount -t yaffs2 /dev/mtdblock2 /mnt
-rm -rf /mnt/* >/dev/null 2>&1
-mkdir /mnt/boot
-mount -t yaffs2 /dev/mtdblock1 /mnt/boot
-
-printf "Extracting install archive\n"
-tar -C /mnt -xzpf $1
-if [ $? -ne 0 ];then
-	printf "Extracting of install archive failed"
-	exit 1
-fi
-
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-
-sync
-umount /mnt/boot
-umount /mnt
-if [ $? -ne 0 ];then
-	printf "Unmounting filesystem failed"
-	exit 1
-else
-	printf "Successfully installed.\n"
-	exit 0
-fi
diff --git a/package/adkinstall/src/adkinstall.rb532 b/package/adkinstall/src/adkinstall.rb532
deleted file mode 100644
index 9f1af0bb6..000000000
--- a/package/adkinstall/src/adkinstall.rb532
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto 
-# a Compact Flash disk or NAND device
-# special script for routerboard rb532
-
-nandinstall=0
-cfinstall=0
-
-if [ -z $1 ];then
-        printf "Please give your target device as first parameter [cf|nand]\n"
-        exit 1
-fi
-if [ -z $2 ];then
-        printf "Please give your root tar archive as second parameter\n"
-        exit 1
-fi
-case $1 in
-	nand)
-		nandinstall=1
-		;;
-	cf)
-		cfinstall=1
-		;;
-	*)
-		printf "Target device not known.\n"
-		exit 1
-		;;
-esac
-
-if [ $cfinstall -eq 1 ];then
-	if [ -z $3 ];then
-       	 printf "Please give your kernel as third parameter\n"
-       	 exit 1
-	fi
-fi
-
-if [ $cfinstall -eq 1 ];then
-	# create empty partition table
-	printf "Creating partition scheme\n"
-	parted -s /dev/sda mklabel msdos
-	sleep 2
-	maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-	rootsize=$(($maxsize-2))
-	parted -s /dev/sda unit cyl mkpart primary ext2 0 1
-	parted -s /dev/sda unit cyl mkpart primary ext2 1 $rootsize
-	parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
-	parted -s /dev/sda set 1 boot on
-	sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1
-	sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1
-	sleep 2
-	mke2fs /dev/sda2
-	sync
-	printf "Installing kernel\n"
-	dd if=$3 of=/dev/sda1 bs=2048 >/dev/null 2>&1
-	sync
-	mount -t ext2 /dev/sda2 /mnt
-fi
-
-if [ $nandinstall -eq 1 ];then
-	printf "Preparing mountpoints\n"
-	mount -t yaffs2 /dev/mtdblock1 /mnt
-	rm -rf /mnt/* >/dev/null 2>&1
-	mkdir /mnt/boot
-	mount -t yaffs2 /dev/mtdblock0 /mnt/boot
-fi
-
-printf "Extracting install archive\n"
-tar -C /mnt -xzpf $2
-if [ $? -ne 0 ];then
-	printf "Extracting of install archive failed"
-	exit 1
-fi
-
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-sync
-
-if [ $nandinstall -eq 1 ];then
-	umount /mnt/boot
-fi
-umount /mnt
-if [ $? -ne 0 ];then
-	printf "Unmounting filesystem failed"
-	exit 1
-else
-	printf "Successfully installed.\n"
-	exit 0
-fi
diff --git a/package/adkinstall/src/adkinstall.yeelong b/package/adkinstall/src/adkinstall.yeelong
deleted file mode 100644
index b6735ec54..000000000
--- a/package/adkinstall/src/adkinstall.yeelong
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a disk
-# lemote yeelong specific installer
-
-check_exit() {
-        if [ $? -ne 0 ];then
-                echo "Installation failed."
-                exit 1
-        fi
-}
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-printf "Creating partitions ...\n"
-parted -s /dev/sda mklabel msdos
-check_exit
-sleep 2
-maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-2))
-start=0
-rootp=1
-cfgfsp=2
-
-parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize
-check_exit
-mke2fs -q /dev/sda1
-check_exit
-parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
-check_exit
-parted -s /dev/sda set $rootp boot on
-check_exit
-sfdisk --change-id /dev/sda $cfgfsp 88 >/dev/null 2>&1
-check_exit
-# settle down
-sleep 2
-mount -t ext2 /dev/sda$rootp /mnt
-check_exit
-printf "Extracting install archive ...\n"
-tar -C /mnt -xzpf $1
-check_exit
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-
-cat << EOF > /mnt/boot/boot.cfg
-default 0
-timeout 3
-showmenu 1
-title OpenADK
-        kernel (wd0,0)/boot/kernel
-        args root=/dev/sda1 ro panic=10
-}
-EOF
-
-umount /mnt
-printf "Successfully installed. You can reboot now.\n"
-exit 0
diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate
deleted file mode 100755
index b5477412f..000000000
--- a/package/base-files/src/sbin/adkupdate
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-
-who=$(id -u)
-if [ $who -ne 0 ]; then
-  echo 'Exit. System update must be run as root.'
-  exit 1
-fi
-
-system=$(awk '/system type/ { print $5 }' /proc/cpuinfo 2>/dev/null)
-
-if [ -x /sbin/mtd ];then
-	if [ "$system" == "AR7" ];then
-		updatecmd="dd bs=16 skip=3 | mtd -r write - linux"
-	else
-		updatecmd="mtd -r write - linux"
-	fi
-else
-	updatecmd="gunzip -c | tar -xf -"
-fi
-
-
-check_exit() {
-	if [ $? -ne 0 ];then
-		echo "Update failed."
-		exit 1
-	fi
-}
-
-prepare() {
-	cd /
-	if [ -x /sbin/cfgfs ];then
-		mount -o bind /tmp/.cfgfs/root /etc
-		check_exit
-		mount -o remount,rw /etc
-		check_exit
-	fi
-	mount -o remount,rw /
-	check_exit
-	if [ "$system" == "RB532" ];then
-		mount -t yaffs2 /dev/mtdblock0 /boot
-	elif [ "$system" == "AR7130" ];then
-		mount -t yaffs2 /dev/mtdblock1 /boot
-	elif [ "$system" == "FOXG20" ];then
-		mount -t vfat /dev/mmcblk0p1 /boot
-	fi
-}
-
-extract_from_file() {
-	prepare
-        cat $1 | eval $updatecmd
-	check_exit
-}
-
-extract_from_ssh() {
-	prepare
-        ssh $1 "cat $2" | eval $updatecmd
-	check_exit
-}
-
-extract_from_http() {
-	prepare
-        wget -O - $1 | eval $updatecmd
-	check_exit
-}
-                
-case $1 in
-        file://*|/*)
-                url=$(echo $1|sed -e "s#file://##")
-		echo "Updating system from $1"
-                extract_from_file $url
-                ;;
-        ssh://*)
-                host=$(echo $1|sed -e "s#ssh://\(.*\):.*#\1#")
-                file=$(echo $1|sed -e "s#ssh://.*:\(.*\)#\1#")
-		echo "Updating system from $1"
-                extract_from_ssh $host $file
-                ;;
-        http://*|ftp://*)
-		echo "Updating system from $1"
-                extract_from_http $1
-                ;;
-        *)
-                echo "No or wrong uri given. exit."
-		echo "Use one of the following uri:"
-		echo "http://myserver/myupdate.tar.gz"
-		echo "ssh://myuser@myserver:/my/path/myupdate.tar.gz"
-		echo "file:///mypath/myupdate.tar.gz"
-                exit 1
-                ;;
-esac
-
-# fix permissions
-if [ -f /usr/bin/sudo ];then
-	chmod 4755 /usr/bin/sudo
-fi
-if [ -f /usr/bin/Xorg ];then
-	chmod 4755 /usr/bin/Xorg
-fi
-
-sync
-if [ -x /sbin/cfgfs ];then
-	umount /etc
-fi
-if [ "$system" == "RB532" ];then
-	umount -f /boot
-elif [ "$system" == "AR7130" ];then
-	umount -f /boot
-elif [ "$system" == "FOXG20" ];then
-	umount -f /boot
-fi
-
-echo "Update sucessful. You should reboot now."
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 6b07623b0..e3b766558 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		1.21.1
 PKG_RELEASE:=		6
 PKG_MD5SUM:=		795394f83903b5eec6567d51eebb417e
 PKG_DESCR:=		core utilities for embedded systems
-PKG_SECTION:=		base
+PKG_SECTION:=		core
 PKG_BUILDDEP:=		bzip2-host
 PKG_URL:=		http://www.busybox.net/
 PKG_SITES:=		http://www.busybox.net/downloads/
diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile
index 5be1c57b2..621b95187 100644
--- a/package/coreutils/Makefile
+++ b/package/coreutils/Makefile
@@ -7,26 +7,24 @@ PKG_NAME:=		coreutils
 PKG_VERSION:=		8.22
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		8fb0ae2267aa6e728958adc38f8163a2
-PKG_DESCR:=		basic file, shell and text manipulation utilities
-PKG_SECTION:=		base
+PKG_DESCR:=		basic file, shell and text manipulation utilities (also provided by busybox)
+PKG_SECTION:=		core
 PKG_BUILDDEP:=		gmp autotool
 PKG_URL:=		http://www.gnu.org/software/coreutils/
 PKG_SITES:=		http://ftp.gnu.org/gnu/coreutils/
+PKG_MULTI:=		1
 
-PKG_SUBPKGS:=		TSORT SHA256SUM TOUCH
+PKG_SUBPKGS:=		COREUTILS TSORT SHA256SUM TOUCH
 PKGSD_TSORT:=		topological sort utility
-PKGSC_TSORT:=		misc
 PKGSD_SHA256SUM:=	SHA1 256 bit checksum utility
-PKGSC_SHA256SUM:=	misc
 PKGSD_TOUCH:=		touch utility
-PKGSC_TOUCH:=		misc
 
 include $(TOPDIR)/mk/package.mk
 
-#$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TSORT},${PKGSC_TSORT}))
-$(eval $(call PKG_template,TOUCH,touch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TOUCH},${PKGSC_TOUCH}))
-$(eval $(call PKG_template,SHA256SUM,sha256sum,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SHA256SUM},${PKGSC_SHA256SUM}))
+$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TSORT},${PKG_SECTION}))
+$(eval $(call PKG_template,TOUCH,touch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TOUCH},${PKG_SECTION}))
+$(eval $(call PKG_template,SHA256SUM,sha256sum,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SHA256SUM},${PKG_SECTION}))
 
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--disable-rpath
diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index 3b4fd3ffd..fa0dd0601 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -7,27 +7,29 @@ PKG_NAME:=		findutils
 PKG_VERSION:=		4.4.2
 PKG_RELEASE:=		5
 PKG_MD5SUM:=		351cc4adb07d54877fa15f75fb77d39f
-PKG_DESCR:=		utilities for finding files
-PKG_SECTION:=		utils
+PKG_DESCR:=		utilities for finding files (also provided by busybox)
+PKG_SECTION:=		core
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP:=		autotool
 HOST_BUILDDEP:=		autotool
 PKG_URL:=		http://www.gnu.org/software/findutils/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/findutils/
+PKG_MULTI:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_SUBPKGS:=		FIND XARGS LOCATE
+PKG_SUBPKGS:=		FINDUTILS XARGS LOCATE FIND
 PKGSD_LOCATE:=		locate utility
 PKGSD_XARGS:=		xargs utility
+PKGSD_FIND:=		find utility
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,FINDUTILS,findutils,$(PKG_VERSION)-${PKG_RELEASE}))
-$(eval $(call PKG_template,FIND,find,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,XARGS,xargs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XARGS},${PKG_SECTION}))
+$(eval $(call PKG_template,FIND,find,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FIND},${PKG_SECTION}))
 $(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION}))
+$(eval $(call PKG_template,XARGS,xargs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XARGS},${PKG_SECTION}))
 
 HOST_STYLE:=		auto
 AUTOTOOL_STYLE:=	autoreconf
diff --git a/package/installer/Makefile b/package/installer/Makefile
deleted file mode 100644
index ed850f057..000000000
--- a/package/installer/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		installer
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-PKG_DESCR:=		OpenADK disk installer
-PKG_SECTION:=		base
-
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
-NO_DISTFILES:=		1
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,INSTALLER,installer,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-do-install:
-	$(INSTALL_BIN) ./src/installer $(IDIR_INSTALLER)/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/installer/src/installer b/package/installer/src/installer
deleted file mode 100755
index 3c24cb6a2..000000000
--- a/package/installer/src/installer
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-#set -x
-
-rootsize=1024
-usbrootsize=512
-cfgsize=16
-
-create_bootcfg() {
-	cat << FOO > /mnt/boot/boot.cfg
-default 0
-timeout 2
-showmenu 1
-title OpenADK
-	kernel (wd0,0)/boot/kernel
-	args root=/dev/sda1
-
-title USB
-	kernel (usb0,0)/boot/kernel-usb
-	args root=/dev/sdc1
-FOO
-
-}
-
-create_fstab() {
-	cat << FOO > /mnt/etc/fstab
-/dev/sda2 /home ext4 defaults 0 0
-/dev/sda3 none swap sw 0 0
-FOO
-
-}
-
-create_usb_fstab() {
-	cat << FOO > /mnt/etc/fstab
-/dev/sdc2 /home ext4 defaults 0 0
-FOO
-
-}
-
-create_home() { 
-	mkdir -p /mnt/home
-	mkdir -p /tmp/home/lemote
-	chown 1000:1000 /tmp/home/lemote
-	echo "lemote:x:1000:1000:Linux User,,,:/home/lemote:/bin/mksh" >> /mnt/etc/passwd
-	echo "lemote:.m3Jtyyc5L4W6:15426:0:99999:7:::" >> /mnt/etc/shadow
-	echo "setxkbmap -option terminate:ctrl_alt_bksp" >> /tmp/home/lemote/.xsession
-	echo fluxbox >> /tmp/home/lemote/.xsession
-}
-
-usb_install() {
-	size=$(parted -s /dev/sdc unit mb print|awk '/Disk/ {print $3}'|sed -e "s#MB##")
-	homesize=$(($size-$usbrootsize-$cfgsize))
-	mkdir /tmp/home
-	parted -s /dev/sdc mklabel msdos
-	parted -s /dev/sdc mkpart primary ext2 0 ${usbrootsize}M 2>&1 >/dev/null
-	parted -s /dev/sdc mkpart primary ext2 ${usbrootsize}M ${homesize}M
-	parted -s /dev/sdc -- mkpart primary ext2 ${homesize}M -0
-	sfdisk --change-id /dev/sdc 3 88 2>&1 >/dev/null
-	echo "Creating filesystem on /home"
-	mke2fs -q -j /dev/sdc2
-	mount -t ext4 /dev/sdc2 /tmp/home
-	echo "Copying system to disk" 
-	dd if=/dev/sdc of=/tmp/home/lemote.tar.gz bs=16384 skip=1024 count=8000 2>/dev/null
-	echo "Creating filesystem on /"
-	mke2fs -q -j /dev/sdc1
-	mount -t ext4 /dev/sdc1 /mnt
-	echo "Installing system to USB disk ..."
-	tar xzf /tmp/home/lemote.tar.gz -C /mnt
-	test -x /mnt/usr/bin/sudo && chmod u+s /mnt/usr/bin/sudo
-	test -x /mnt/usr/bin/Xorg && chmod u+s /mnt/usr/bin/Xorg
-	create_home
-	create_bootcfg
-	create_usb_fstab
-	umount /mnt
-	umount /tmp/home
-	
-}
-
-disk_install() {
-	size=$(parted -s /dev/sda unit mb print|awk '/Disk/ {print $3}'|sed -e "s#MB##")
-	swap=1024
-	homesize=$(($size-$rootsize-$cfgsize-$swap))
-	swapsize=$(($homesize+$swap))
-	mkdir /tmp/home
-	parted -s /dev/sda mklabel msdos
-	parted -s /dev/sda mkpart primary ext2 0 ${rootsize}M 2>&1 >/dev/null
-	parted -s /dev/sda mkpart primary ext2 ${rootsize}M ${homesize}M
-	parted -s /dev/sda mkpart primary ext2 ${homesize}M ${swapsize}M
-	parted -s /dev/sda -- mkpart primary ext2 ${swapsize}M -0
-	sfdisk --change-id /dev/sda 3 82 2>&1 >/dev/null
-	sfdisk --change-id /dev/sda 4 88 2>&1 >/dev/null
-	sleep 2
-	echo "Creating filesystem on /home"
-	mke2fs -q -j /dev/sda2
-	mkswap /dev/sda3
-	mount -t ext4 /dev/sda2 /tmp/home
-	echo "Copying system to disk" 
-	dd if=/dev/sdc of=/tmp/home/lemote.tar.gz bs=16384 skip=1024 count=8000 2>/dev/null
-	mke2fs -q -j /dev/sda1
-	mount -t ext4 /dev/sda1 /mnt
-	echo "Installing system to hard disk ..."
-	tar xzf /tmp/home/lemote.tar.gz -C /mnt
-	test -x /mnt/usr/bin/sudo && chmod u+s /mnt/usr/bin/sudo
-	test -x /mnt/usr/bin/Xorg && chmod u+s /mnt/usr/bin/Xorg
-	create_home
-	create_bootcfg
-	create_fstab
-	umount /mnt
-	umount /tmp/home
-	
-}
-
-. /etc/functions.sh
-echo 0 > /proc/sys/kernel/printk
-
-load_modules /etc/modules
-for f in /etc/modules.d/*; do
-	[[ -e $f ]] && load_modules /etc/modules.d/*
-	break
-done
-
-echo "  ___                      _    ____  _  __ "
-echo " / _ \ _ __   ___ _ __    / \  |  _ \| |/ / "
-echo "| | | | '_ \ / _ \ '_ \  / _ \ | | | | ' /  "
-echo "| |_| | |_) |  __/ | | |/ ___ \| |_| | . \  "
-echo " \___/| .__/ \___|_| |_/_/   \_\____/|_|\_\ "
-echo "      |_|                                   "
-echo ""
-# settle down, after module load
-sleep 2
-echo "Should I install OpenADK to disk (d) or usb disk (u) or do nothing (any key)"
-read answer
-if [ "$answer" = "d" ];then
-	disk_install
-fi
-if [ "$answer" = "u" ];then
-	usb_install
-fi
-echo "Should I reboot now (y/n)"
-read answer
-if [ "$answer" = "y" ];then
-	/bin/busybox reboot -f
-else
-	exit
-fi
diff --git a/package/section.lst b/package/section.lst
index 9476cb44d..7302a4a4f 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -1,5 +1,6 @@
-base	Base System
 boot	Boot Loaders
+base	Base System and Libraries
+core	Basic System commands
 browser	Browser / Editor / Pager
 editor	Browser / Editor / Pager
 pager	Browser / Editor / Pager
diff --git a/package/uclibc/Config.in.manual b/package/uclibc/Config.in.manual
index bf8021d6c..7cfe210f5 100644
--- a/package/uclibc/Config.in.manual
+++ b/package/uclibc/Config.in.manual
@@ -1,5 +1,5 @@
 config ADK_PACKAGE_UCLIBC
-	prompt "uClibc................. embedded C library"
+	prompt "uClibc............... embedded C library"
 	bool
 	default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY
 	default n
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 636b43f48..4a2a48d30 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -4,47 +4,54 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		util-linux
-PKG_VERSION:=		2.23.2
-PKG_RELEASE:=		6
-PKG_MD5SUM:=		b39fde897334a4858bb2098edcce5b3f
-PKG_DESCR:=		Linux utilities (meta-package)
-PKG_SECTION:=		utils
-PKG_DEPENDS:=		mount fdisk sfdisk swap-utils losetup mount mcookie
+PKG_VERSION:=		2.24.2