diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-02 08:17:45 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-02 08:18:07 +0200 |
| commit | f0066beb4d617c93d69d2a5308a2a19dffa13b3c (patch) | |
| tree | 506e10a6f715654658e3b941c4366bd3080ac0b5 | |
| parent | 29949a05b6be852c6ad2835b50087dac35b27023 (diff) | |
create core package section, cleanup old installer stuff
29 files changed, 52 insertions, 948 deletions
diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c index 6997f3def..ef10d1120 100644 --- a/adk/tools/pkgmaker.c +++ b/adk/tools/pkgmaker.c @@ -758,7 +758,7 @@ int main() { fprintf(cfg, "\ttristate\n"); if (pkg_multi != NULL) if (strncmp(pkg_multi, "1", 1) == 0) - if (strncmp(toupperstr(token), toupperstr(pkgdirp->d_name), strlen(token)) != 0) + if (strncmp(toupperstr(token), toupperstr(pkgdirp->d_name), strlen(pkgdirp->d_name)) != 0) fprintf(cfg, "\tdepends on ADK_PACKAGE_%s\n", toupperstr(pkgdirp->d_name)); free(pseudo_name); 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 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 3f191727a0d28f7204b755cf1b6ea0aa +PKG_DESCR:= basic Linux utilities (also provided by busybox) +PKG_SECTION:= core PKG_BUILDDEP:= ncurses -PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.23/ +PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.24/ PKG_NOPARALLEL:= 1 PKG_OPTS:= dev +PKG_MULTI:= 1 PKG_ARCH_DEPENDS:= !m68k PKG_SUBPKGS:= UTIL_LINUX FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT -PKG_SUBPKGS+= LIBUUID LIBBLKID LIBMOUNT -PKGSD_LIBUUID:= UUID library +PKG_SUBPKGS+= LIBUUID LIBBLKID LIBMOUNT SU CFDISK +PKGSD_LIBUUID:= uuid library PKGSC_LIBUUID:= libs -PKGSD_LIBBLKID:= BLKID library +PKGSD_LIBBLKID:= blkid library PKGSC_LIBBLKID:= libs -PKGSD_LIBMOUNT:= Mount library +PKGSD_LIBMOUNT:= mount library PKGSC_LIBMOUNT:= libs -PKGSD_FDISK:= Partition table manipulation utility -PKGSC_FDISK:= fs -PKGSD_SFDISK:= Scriptable Partition table manipulation utility +PKGSD_FDISK:= partition table manipulation utility +PKGSC_FDISK:= core +PKGSD_SFDISK:= scriptable partition table manipulation utility PKGSC_SFDISK:= fs -PKGSD_SWAP_UTILS:= Swap space management utilities +PKGSD_CFDISK:= partition table manipulation utility +PKGSC_CFDISK:= fs +PKGSD_SU:= switch user utility +PKGSB_SU:= pam +PKGSC_SU:= core +PKGSD_SWAP_UTILS:= swap space management utilities PKGSS_SWAP_UTILS:= libblkid -PKGSC_SWAP_UTILS:= fs -PKGSD_LOSETUP:= Loop devices management utilities +PKGSC_SWAP_UTILS:= core +PKGSD_LOSETUP:= loop devices management utilities PKGSS_LOSETUP:= kmod-blk-dev-loop PKGSD_MOUNT:= mount/umount utilities PKGSS_MOUNT:= libblkid libmount libuuid -PKGSC_MOUNT:= fs -PKGSD_MCOOKIE:= Generate magic cookies for xauth +PKGSC_MOUNT:= core +PKGSD_MCOOKIE:= generate magic cookies for xauth PKGSC_MCOOKIE:= x11/apps include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,UTIL_LINUX,util-linux,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FDISK},${PKGSC_FDISK})) +$(eval $(call PKG_template,CFDISK,cfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CFDISK},${PKGSC_CFDISK})) $(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SFDISK},${PKGSC_SFDISK})) +$(eval $(call PKG_template,SU,su,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SU},${PKGSD_SU},${PKGSC_SU})) $(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP_UTILS},${PKGSD_SWAP_UTILS},${PKGSC_SWAP_UTILS})) $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKG_SECTION})) $(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MOUNT},${PKGSD_MOUNT},${PKGSC_MOUNT})) @@ -59,7 +66,7 @@ CONFIGURE_ARGS+= --disable-use-tty-group \ --disable-schedutils \ --disable-cramfs \ --disable-login \ - --disable-su \ + --enable-su \ --enable-libuuid \ --enable-libblkid \ --enable-libmount \ @@ -69,12 +76,14 @@ CONFIGURE_ARGS+= --disable-use-tty-group \ FAKE_FLAGS+= INSTALLSUID="install -m 4755" TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -ltinfo -util-linux-install: - fdisk-install: ${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin ${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin +cfdisk-install: + ${INSTALL_DIR} ${IDIR_CFDISK}/usr/sbin + ${CP} ${WRKINST}/sbin/cfdisk ${IDIR_FDISK}/usr/sbin + sfdisk-install: ${INSTALL_DIR} ${IDIR_SFDISK}/usr/sbin ${CP} ${WRKINST}/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin diff --git a/package/util-linux/patches/patch-fdisks_cfdisk_c b/package/util-linux/patches/patch-fdisks_cfdisk_c deleted file mode 100644 index c7595e3cc..000000000 --- a/package/util-linux/patches/patch-fdisks_cfdisk_c +++ /dev/null @@ -1,13 +0,0 @@ -patch taken from sabotage linux -- https://github.com/rofl0r/sabotage - ---- util-linux-2.23.2.orig/fdisks/cfdisk.c 2013-07-30 10:39:26.000000000 +0200 -+++ util-linux-2.23.2/fdisks/cfdisk.c 2013-08-14 12:42:25.000000000 +0200 -@@ -325,7 +325,7 @@ int num_parts = 0; - int logical = 0; - long long logical_sectors[MAXIMUM_PARTS]; - --__sighandler_t old_SIGINT, old_SIGTERM; -+sighandler_t old_SIGINT, old_SIGTERM; - - int arrow_cursor = FALSE; - int display_units = MEGABYTES; diff --git a/package/util-linux/patches/patch-fdisks_fdisksunlabel_c b/package/util-linux/patches/patch-fdisks_fdisksunlabel_c deleted file mode 100644 index 35851b9b6..000000000 --- a/package/util-linux/patches/patch-fdisks_fdisksunlabel_c +++ /dev/null @@ -1,30 +0,0 @@ -patch taken from sabotage linux -- https://github.com/rofl0r/sabotage - ---- util-linux-2.23.2.orig/fdisks/fdisksunlabel.c 2013-07-30 10:39:26.000000000 +0200 -+++ util-linux-2.23.2/fdisks/fdisksunlabel.c 2013-08-14 12:38:12.000000000 +0200 -@@ -383,9 +383,11 @@ static void fetch_sun(struct fdisk_conte - } - } - --static int verify_sun_cmp(int *a, int *b, void *data) -+static void* cmp_data; -+static int verify_sun_cmp(const void *pa, const void *pb) - { -- unsigned int *verify_sun_starts = (unsigned int *) data; -+ const int *a = pa, *b = pb; -+ unsigned int *verify_sun_starts = (unsigned int *) cmp_data; - - if (*a == -1) - return 1; -@@ -449,9 +451,8 @@ static int sun_verify_disklabel(struct f - else - array[i] = -1; - } -- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), -- (int (*)(const void *,const void *,void *)) verify_sun_cmp, -- verify_sun_starts); -+ cmp_data = verify_sun_starts; -+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), verify_sun_cmp); - - if (array[0] == -1) { - fdisk_info(cxt, _("No partitions defined")); diff --git a/package/util-linux/patches/patch-include_ttyutils_h b/package/util-linux/patches/patch-include_ttyutils_h deleted file mode 100644 index 2fd1baed0..000000000 --- a/package/util-linux/patches/patch-include_ttyutils_h +++ /dev/null @@ -1,12 +0,0 @@ -patch taken from sabotage linux -- https://github.com/rofl0r/sabotage - ---- util-linux-2.23.2.orig/include/ttyutils.h 2013-07-15 10:25:46.000000000 +0200 -+++ util-linux-2.23.2/include/ttyutils.h 2013-08-14 12:31:25.000000000 +0200 -@@ -10,6 +10,7 @@ - #include <stdlib.h> - #include <termios.h> - #include <limits.h> -+#include <sys/ttydefaults.h> - #ifdef HAVE_SYS_IOCTL_H - #include <sys/ioctl.h> - #endif diff --git a/package/util-linux/patches/patch-lib_fileutils_c b/package/util-linux/patches/patch-lib_fileutils_c deleted file mode 100644 index d4edf1c6a..000000000 --- a/package/util-linux/patches/patch-lib_fileutils_c +++ /dev/null @@ -1,14 +0,0 @@ ---- util-linux-2.23.2.orig/lib/fileutils.c 2013-06-13 09:46:10.000000000 +0200 -+++ util-linux-2.23.2/lib/fileutils.c 2013-08-14 11:58:47.000000000 +0200 -@@ -37,7 +37,11 @@ int xmkstemp(char **tmpname, char *dir) - xasprintf(&localtmp, "%s/%s.XXXXXX", _PATH_TMP, - program_invocation_short_name); - old_mode = umask(077); -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - fd = mkostemp(localtmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC); -+#else -+ fd = mkstemp(localtmp); -+#endif - umask(old_mode); - if (fd == -1) { - free(localtmp); diff --git a/package/util-linux/patches/patch-libblkid_blkid_pc_in b/package/util-linux/patches/patch-libblkid_blkid_pc_in deleted file mode 100644 index 475bc2f92..000000000 --- a/package/util-linux/patches/patch-libblkid_blkid_pc_in +++ /dev/null @@ -1,12 +0,0 @@ ---- util-linux-2.23.2.orig/libblkid/blkid.pc.in 2013-02-27 17:46:29.000000000 +0100 -+++ util-linux-2.23.2/libblkid/blkid.pc.in 2013-10-28 12:08:14.000000000 +0100 -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@usrlib_execdir@ --includedir=@includedir@ -+libdir=${prefix}/lib -+includedir=${prefix}/include - - Name: blkid - Description: Block device id library diff --git a/package/util-linux/patches/patch-libblkid_src_save_c b/package/util-linux/patches/patch-libblkid_src_save_c deleted file mode 100644 index c25f42c10..000000000 --- a/package/util-linux/patches/patch-libblkid_src_save_c +++ /dev/null @@ -1,14 +0,0 @@ ---- util-linux-2.23.2.orig/libblkid/src/save.c 2013-07-30 10:39:26.000000000 +0200 -+++ util-linux-2.23.2/libblkid/src/save.c 2013-08-14 11:59:06.000000000 +0200 -@@ -110,7 +110,11 @@ int blkid_flush_cache(blkid_cache cache) - tmp = malloc(strlen(filename) + 8); - if (tmp) { - sprintf(tmp, "%s-XXXXXX", filename); -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - fd = mkostemp(tmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC); -+#else -+ fd = mkstemp(tmp); -+#endif - if (fd >= 0) { - if (fchmod(fd, 0644) != 0) - DBG(SAVE, blkid_debug("%s: fchmod failed", filename)); diff --git a/package/util-linux/patches/patch-libmount_src_utils_c b/package/util-linux/patches/patch-libmount_src_utils_c deleted file mode 100644 index b0fcc2afa..000000000 --- a/package/util-linux/patches/patch-libmount_src_utils_c +++ /dev/null @@ -1,14 +0,0 @@ ---- util-linux-2.23.2.orig/libmount/src/utils.c 2013-07-30 11:15:27.000000000 +0200 -+++ util-linux-2.23.2/libmount/src/utils.c 2013-08-14 11:58:25.000000000 +0200 -@@ -842,7 +842,11 @@ int mnt_open_uniq_filename(const char *f - */ - oldmode = umask(S_IRGRP|S_IWGRP|S_IXGRP| - S_IROTH|S_IWOTH|S_IXOTH); -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - fd = mkostemp(n, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC); -+#else -+ fd = mkstemp(n); -+#endif - umask(oldmode); - - if (fd >= 0 && name) diff --git a/package/util-linux/patches/patch-libuuid_uuid_pc_in b/package/util-linux/patches/patch-libuuid_uuid_pc_in deleted file mode 100644 index 059310086..000000000 --- a/package/util-linux/patches/patch-libuuid_uuid_pc_in +++ /dev/null @@ -1,13 +0,0 @@ ---- util-linux-2.23.2.orig/libuuid/uuid.pc.in 2013-02-27 17:46:29.883020734 +0100 -+++ util-linux-2.23.2/libuuid/uuid.pc.in 2013-12-17 17:07:37.935403478 +0100 -@@ -1,7 +1,7 @@ - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@usrlib_execdir@ --includedir=@includedir@ -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=${prefix}/include - - Name: uuid - Description: Universally unique id library diff --git a/package/util-linux/patches/patch-term-utils_setterm_c b/package/util-linux/patches/patch-term-utils_setterm_c deleted file mode 100644 index bd84e5bbb..000000000 --- a/package/util-linux/patches/patch-term-utils_setterm_c +++ /dev/null @@ -1,13 +0,0 @@ -patch taken from sabotage linux -- https://github.com/rofl0r/sabotage - ---- util-linux-2.23.2.orig/term-utils/setterm.c 2013-06-13 09:46:10.000000000 +0200 -+++ util-linux-2.23.2/term-utils/setterm.c 2013-08-14 12:47:43.000000000 +0200 -@@ -123,7 +123,7 @@ - #include "nls.h" - #include "closestream.h" - --#if __GNU_LIBRARY__ < 5 -+#if defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 5 - #ifndef __alpha__ - # include <linux/unistd.h> - #define __NR_klogctl __NR_syslog diff --git a/package/util-linux/patches/patch-term-utils_ttymsg_c b/package/util-linux/patches/patch-term-utils_ttymsg_c deleted file mode 100644 index a93f16d4e..000000000 --- a/package/util-linux/patches/patch-term-utils_ttymsg_c +++ /dev/null @@ -1,12 +0,0 @@ -patch taken from sabotage linux -- https://github.com/rofl0r/sabotage - ---- util-linux-2.23.2.orig/term-utils/ttymsg.c 2013-07-30 10:39:26.000000000 +0200 -+++ util-linux-2.23.2/term-utils/ttymsg.c 2013-08-14 12:50:50.000000000 +0200 -@@ -41,6 +41,7 @@ - */ - - #include <sys/types.h> -+#include <sys/param.h> - #include <sys/uio.h> - #include <signal.h> - #include <fcntl.h> diff --git a/package/util-linux/patches/patch-text-utils_hexdump_h b/package/util-linux/patches/patch-text-utils_hexdump_h deleted file mode 100644 index 79e53a00d..000000000 --- a/package/util-linux/patches/patch-text-utils_hexdump_h +++ /dev/null @@ -1,12 +0,0 @@ -patch taken from sabotage linux -- https://github.com/rofl0r/sabotage - ---- util-linux-2.23.2.orig/text-utils/hexdump.h 2013-07-30 10:39:26.000000000 +0200 -+++ util-linux-2.23.2/text-utils/hexdump.h 2013-08-14 12:44:31.000000000 +0200 -@@ -33,6 +33,7 @@ - * @(#)hexdump.h 5.4 (Berkeley) 6/1/90 - */ - -+#include <sys/types.h> - typedef struct _pr { - struct _pr *nextpr; /* next print unit */ - #define F_ADDRESS 0x001 /* print offset */ diff --git a/package/util-linux/patches/patch-text-utils_pg_c b/package/util-linux/patches/patch-text-utils_pg_c deleted file mode 100644 index daa6adaee..000000000 --- a/package/util-linux/patches/patch-text-utils_pg_c +++ /dev/null @@ -1,13 +0,0 @@ -patch taken from sabotage linux -- https://github.com/rofl0r/sabotage - ---- util-linux-2.23.2.orig/text-utils/pg.c 2013-07-30 10:39:26.000000000 +0200 -+++ util-linux-2.23.2/text-utils/pg.c 2013-08-14 12:44:55.000000000 +0200 -@@ -37,7 +37,7 @@ - #ifndef TIOCGWINSZ - # include <sys/ioctl.h> - #endif --#include <sys/termios.h> -+#include <termios.h> - #include <fcntl.h> - #include <regex.h> - #include <stdio.h> diff --git a/package/uvd/Makefile b/package/uvd/Makefile index e782d9f2e..3e48de961 100644 --- a/package/uvd/Makefile +++ b/package/uvd/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= uvd PKG_VERSION:= 0.1 PKG_RELEASE:= 2 PKG_DESCR:= udp server for version information -PKG_SECTION:= base +PKG_SECTION:= misc PKG_URL:= http://openadk.org/ NO_DISTFILES:= 1 |