diff options
Diffstat (limited to 'packages')
103 files changed, 1039 insertions, 2290 deletions
diff --git a/packages/busybox/busybox-1.2.1/angstrom/defconfig b/packages/busybox/busybox-1.2.1/angstrom/defconfig index 1807dab68e..5e0aa71614 100644 --- a/packages/busybox/busybox-1.2.1/angstrom/defconfig +++ b/packages/busybox/busybox-1.2.1/angstrom/defconfig @@ -123,7 +123,7 @@ CONFIG_CHROOT=y CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y -# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_IBS_OBS is not set @@ -257,7 +257,7 @@ CONFIG_MKTEMP=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y CONFIG_START_STOP_DAEMON=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y diff --git a/packages/busybox/busybox-1.2.1/avr32/defconfig b/packages/busybox/busybox-1.2.1/avr32/defconfig index b15f162a7d..112eb21d7e 100644 --- a/packages/busybox/busybox-1.2.1/avr32/defconfig +++ b/packages/busybox/busybox-1.2.1/avr32/defconfig @@ -123,7 +123,7 @@ CONFIG_CHROOT=y CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y -# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_IBS_OBS is not set @@ -253,7 +253,7 @@ CONFIG_MKTEMP=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y CONFIG_START_STOP_DAEMON=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y diff --git a/packages/busybox/busybox-1.2.1/defconfig b/packages/busybox/busybox-1.2.1/defconfig index 7308eead76..4bb48eb09d 100644 --- a/packages/busybox/busybox-1.2.1/defconfig +++ b/packages/busybox/busybox-1.2.1/defconfig @@ -123,7 +123,7 @@ CONFIG_CHROOT=y CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y -# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_IBS_OBS is not set @@ -257,7 +257,7 @@ CONFIG_MKTEMP=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y CONFIG_START_STOP_DAEMON=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y diff --git a/packages/busybox/busybox-1.2.1/nylon/defconfig b/packages/busybox/busybox-1.2.1/nylon/defconfig index 8a7aa8b00f..1e8ebb15a5 100644 --- a/packages/busybox/busybox-1.2.1/nylon/defconfig +++ b/packages/busybox/busybox-1.2.1/nylon/defconfig @@ -243,7 +243,7 @@ CONFIG_PIPE_PROGRESS=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y CONFIG_START_STOP_DAEMON=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set diff --git a/packages/busybox/busybox-1.2.1/slugos/defconfig b/packages/busybox/busybox-1.2.1/slugos/defconfig index 74ece9c3b6..6ec2e8bee7 100644 --- a/packages/busybox/busybox-1.2.1/slugos/defconfig +++ b/packages/busybox/busybox-1.2.1/slugos/defconfig @@ -123,7 +123,7 @@ CONFIG_CHROOT=y CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y -# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_IBS_OBS is not set @@ -257,7 +257,7 @@ CONFIG_MKTEMP=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y CONFIG_START_STOP_DAEMON=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y diff --git a/packages/busybox/busybox-1.7.2/defconfig b/packages/busybox/busybox-1.7.2/defconfig index b878e95dec..11ec1b8aa6 100644 --- a/packages/busybox/busybox-1.7.2/defconfig +++ b/packages/busybox/busybox-1.7.2/defconfig @@ -143,7 +143,7 @@ CONFIG_CHROOT=y CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y -# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_IBS_OBS is not set diff --git a/packages/busybox/busybox-static-1.2.1/defconfig b/packages/busybox/busybox-static-1.2.1/defconfig index 1807dab68e..5e0aa71614 100644 --- a/packages/busybox/busybox-static-1.2.1/defconfig +++ b/packages/busybox/busybox-static-1.2.1/defconfig @@ -123,7 +123,7 @@ CONFIG_CHROOT=y CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y -# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_IBS_OBS is not set @@ -257,7 +257,7 @@ CONFIG_MKTEMP=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y CONFIG_START_STOP_DAEMON=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y diff --git a/packages/busybox/busybox-static_1.2.1.bb b/packages/busybox/busybox-static_1.2.1.bb index 519468039a..e51bb86da0 100644 --- a/packages/busybox/busybox-static_1.2.1.bb +++ b/packages/busybox/busybox-static_1.2.1.bb @@ -1,5 +1,5 @@ require busybox_${PV}.bb -PR = "r1" +PR = "r2" S = "${WORKDIR}/busybox-1.2.1" diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb index 3b7016a42c..1accc790a2 100644 --- a/packages/busybox/busybox_1.2.1.bb +++ b/packages/busybox/busybox_1.2.1.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r15" +PR = "r16" SRC_URI += "file://wget-long-options.patch;patch=1 \ file://df_rootfs.patch;patch=1 \ diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb index 75847e1117..fbf05e7182 100644 --- a/packages/busybox/busybox_1.2.2.bb +++ b/packages/busybox/busybox_1.2.2.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb index 369500fc7b..1eea1edea2 100644 --- a/packages/busybox/busybox_1.3.1.bb +++ b/packages/busybox/busybox_1.3.1.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb index 269400106b..285096ce43 100644 --- a/packages/busybox/busybox_1.7.2.bb +++ b/packages/busybox/busybox_1.7.2.bb @@ -1,6 +1,5 @@ require busybox.inc - -PR = "r4" +PR = "r6" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://busybox-cron \ diff --git a/packages/busybox/files/syslog b/packages/busybox/files/syslog index a999565e84..61d273b7cb 100644 --- a/packages/busybox/files/syslog +++ b/packages/busybox/files/syslog @@ -11,7 +11,7 @@ if [ -f /etc/syslog.conf ]; then LOG_REMOTE=0 for D in $DESTINATION; do if [ "$D" = "buffer" ]; then - SYSLOG_ARGS="$SYSLOG_ARGS -C $BUFFERSIZE" + SYSLOG_ARGS="$SYSLOG_ARGS -C$BUFFERSIZE" LOG_LOCAL=1 elif [ "$D" = "file" ]; then if [ -n "$LOGFILE" ]; then diff --git a/packages/busybox/slingbox-1.00/defconfig b/packages/busybox/slingbox-1.00/defconfig deleted file mode 100644 index 6b15e1944b..0000000000 --- a/packages/busybox/slingbox-1.00/defconfig +++ /dev/null @@ -1,334 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_FEATURE_VERBOSE_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_FEATURE_DEVPTS is not set -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_SUID is not set -# CONFIG_SELINUX is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -CONFIG_LFS=y -USING_CROSS_COMPILER=y -CROSS_COMPILER_PREFIX="armv5b-softfloat-linux-" -EXTRA_CFLAGS_OPTIONS="" - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -PREFIX="/" - -# -# Archival Utilities -# -# CONFIG_AR is not set -CONFIG_BUNZIP2=y -# CONFIG_CPIO is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -CONFIG_GUNZIP=y -CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -# CONFIG_FEATURE_TAR_FROM is not set -CONFIG_FEATURE_TAR_GZIP=y -CONFIG_FEATURE_TAR_COMPRESS=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_UNCOMPRESS=y -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set - -# -# Coreutils -# -# CONFIG_BASENAME is not set -# CONFIG_CAL is not set -# CONFIG_CAT is not set -# CONFIG_CHGRP is not set -# CONFIG_CHMOD is not set -# CONFIG_CHOWN is not set -CONFIG_CHROOT=y -# CONFIG_CMP is not set -# CONFIG_CP is not set -CONFIG_CUT=y -# CONFIG_DATE is not set -# CONFIG_DD is not set -# CONFIG_DF is not set -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -CONFIG_DU=y -# CONFIG_ECHO is not set -# CONFIG_ENV is not set -CONFIG_EXPR=y -# CONFIG_FALSE is not set -# CONFIG_FOLD is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set -# CONFIG_ID is not set -# CONFIG_INSTALL is not set -# CONFIG_LENGTH is not set -# CONFIG_LN is not set -# CONFIG_LOGNAME is not set -# CONFIG_LS is not set -CONFIG_MD5SUM=y -# CONFIG_MKDIR is not set -CONFIG_MKFIFO=y -# CONFIG_MKNOD is not set -# CONFIG_MV is not set -# CONFIG_OD is not set -# CONFIG_PRINTF is not set -# CONFIG_PWD is not set -# CONFIG_REALPATH is not set -# CONFIG_RM is not set -CONFIG_RMDIR=y -# CONFIG_SEQ is not set -# CONFIG_SHA1SUM is not set -# CONFIG_SLEEP is not set -CONFIG_SORT=y -# CONFIG_STTY is not set -# CONFIG_SYNC is not set -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -# CONFIG_TEST is not set -# CONFIG_TOUCH is not set -# CONFIG_TR is not set -# CONFIG_TRUE is not set -# CONFIG_TTY is not set -CONFIG_UNAME=y -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -# CONFIG_WATCH is not set -# CONFIG_WC is not set -# CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -# CONFIG_YES is not set - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -# CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -# CONFIG_RESET is not set -# CONFIG_SETKEYCODES is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_READLINK is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_WHICH is not set - -# -# Editors -# -CONFIG_AWK=y -# CONFIG_PATCH is not set -CONFIG_SED=y -# CONFIG_VI is not set - -# -# Finding Utilities -# -# CONFIG_FIND is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set -# CONFIG_LOGIN is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_CROND is not set -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_DEVFSD is not set -# CONFIG_LAST is not set -# CONFIG_HDPARM is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_MT is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -# CONFIG_TIME is not set -# CONFIG_WATCHDOG is not set - -# -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_MODPROBE is not set -# CONFIG_RMMOD is not set - -# -# Networking Utilities -# -# CONFIG_FEATURE_IPV6 is not set -# CONFIG_ARPING is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_HOSTNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_IFCONFIG is not set -# CONFIG_IFUPDOWN is not set -# CONFIG_INETD is not set -# CONFIG_IP is not set -# CONFIG_IPCALC is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_NAMEIF is not set -CONFIG_NC=y -# CONFIG_NETSTAT is not set -# CONFIG_NSLOOKUP is not set -# CONFIG_PING is not set -# CONFIG_ROUTE is not set -# CONFIG_TELNET is not set -# CONFIG_TELNETD is not set -# CONFIG_TFTP is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -# CONFIG_FEATURE_WGET_STATUSBAR is not set -# CONFIG_FEATURE_WGET_AUTHENTICATION is not set -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set - -# -# udhcp Server/Client -# -# CONFIG_UDHCPD is not set -# CONFIG_UDHCPC is not set - -# -# Process Utilities -# -CONFIG_FREE=y -# CONFIG_KILL is not set -# CONFIG_PIDOF is not set -# CONFIG_PS is not set -# CONFIG_RENICE is not set -# CONFIG_TOP is not set -# CONFIG_UPTIME is not set -# CONFIG_SYSCTL is not set - -# -# Another Bourne-like Shell -# -# CONFIG_FEATURE_SH_IS_ASH is not set -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -CONFIG_FEATURE_SH_IS_NONE=y -# CONFIG_ASH is not set -# CONFIG_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# System Logging Utilities -# -# CONFIG_SYSLOGD is not set -# CONFIG_LOGGER is not set - -# -# Linux System Utilities -# -# CONFIG_DMESG is not set -# CONFIG_FBSET is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -CONFIG_FREERAMDISK=y -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -# CONFIG_HWCLOCK is not set -CONFIG_LOSETUP=y -# CONFIG_MKSWAP is not set -# CONFIG_MORE is not set -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -# CONFIG_SWAPONOFF is not set -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/slingbox-1.00/lazy_umount.patch b/packages/busybox/slingbox-1.00/lazy_umount.patch deleted file mode 100644 index 0608017e70..0000000000 --- a/packages/busybox/slingbox-1.00/lazy_umount.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- busybox-1.00-orig/util-linux/umount.c 2005-12-16 23:13:33.000000000 -0600 -+++ busybox-1.00/util-linux/umount.c 2005-12-16 23:16:49.000000000 -0600 -@@ -35,6 +35,7 @@ - #endif - - static const int MNT_FORCE = 1; -+static const int MNT_DETACH = 2; /* Linksys -L mod */ - static const int MS_MGC_VAL = 0xc0ed0000; /* Magic number indicatng "new" flags */ - static const int MS_REMOUNT = 32; /* Alter flags of a mounted FS. */ - static const int MS_RDONLY = 1; /* Mount read-only. */ -@@ -54,7 +55,7 @@ - static struct _mtab_entry_t *mtab_cache = NULL; - - -- -+static int doLazy = FALSE; /* Linksys -L mod */ - #if defined CONFIG_FEATURE_MOUNT_FORCE - static int doForce = FALSE; - #endif -@@ -181,6 +182,12 @@ - /* this was a loop device, delete it */ - del_loop(blockDevice); - #endif -+ if (status != 0 && doLazy) { /* Linksys -L mod */ -+ status = umount2(blockDevice, MNT_DETACH); -+ if (status != 0) { -+ bb_error_msg_and_die("lazy umount of %s failed!", blockDevice); -+ } -+ } - #if defined CONFIG_FEATURE_MOUNT_FORCE - if (status != 0 && doForce) { - status = umount2(blockDevice, MNT_FORCE); -@@ -259,6 +266,9 @@ - freeLoop = FALSE; - break; - #endif -+ case 'L': /* Linksys -L mod */ -+ doLazy = TRUE; -+ break; - #ifdef CONFIG_FEATURE_MTAB_SUPPORT - case 'n': - useMtab = FALSE; diff --git a/packages/busybox/slingbox-1.00/slingbox.patch b/packages/busybox/slingbox-1.00/slingbox.patch deleted file mode 100644 index 6f5594b284..0000000000 --- a/packages/busybox/slingbox-1.00/slingbox.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- busybox-1.00-rc3/applets/install.sh 2001-03-09 08:12:11.000000000 +1030 -+++ slingbox/applets/install.sh 2004-08-31 11:27:23.000000000 +0930 -@@ -16,28 +16,28 @@ - h=`sort busybox.links | uniq` - - --rm -f $prefix/bin/busybox || exit 1 -+rm -f $prefix/bin/slingbox || exit 1 - mkdir -p $prefix/bin || exit 1 --install -m 755 busybox $prefix/bin/busybox || exit 1 -+install -m 755 busybox $prefix/bin/slingbox || exit 1 - - for i in $h ; do - appdir=`dirname $i` - mkdir -p $prefix/$appdir || exit 1 - if [ "$2" = "--hardlinks" ]; then -- bb_path="$prefix/bin/busybox" -+ bb_path="$prefix/bin/slingbox" - else - case "$appdir" in - /) -- bb_path="bin/busybox" -+ bb_path="bin/slingbox" - ;; - /bin) -- bb_path="busybox" -+ bb_path="slingbox" - ;; - /sbin) -- bb_path="../bin/busybox" -+ bb_path="../bin/slingbox" - ;; - /usr/bin|/usr/sbin) -- bb_path="../../bin/busybox" -+ bb_path="../../bin/slingbox" - ;; - *) - echo "Unknown installation directory: $appdir" diff --git a/packages/busybox/slingbox-1.1.3/Makefile_args.patch b/packages/busybox/slingbox-1.1.3/Makefile_args.patch deleted file mode 100644 index 7561a89b94..0000000000 --- a/packages/busybox/slingbox-1.1.3/Makefile_args.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- busybox-1.1.2/Makefile.orig 2006-04-10 14:45:46.000000000 -0500 -+++ busybox-1.1.2/Makefile 2006-05-15 00:54:31.000000000 -0500 -@@ -79,6 +79,8 @@ - top_srcdir=$(top_srcdir) \ - top_builddir=$(top_builddir) \ - KBUILD_SRC=$(top_srcdir) \ -+ PREFIX=$(PREFIX) \ -+ CROSS=$(CROSS) \ - -f $(CURDIR)/Makefile $@ - - $(KBUILD_OUTPUT)/Rules.mak: diff --git a/packages/busybox/slingbox-1.1.3/defconfig b/packages/busybox/slingbox-1.1.3/defconfig deleted file mode 100644 index f1fe0d6d2d..0000000000 --- a/packages/busybox/slingbox-1.1.3/defconfig +++ /dev/null @@ -1,594 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_FEATURE_VERBOSE_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_FEATURE_DEVPTS is not set -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_SUID is not set -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_DISABLE_SHARED is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -USING_CROSS_COMPILER=y -CROSS_COMPILER_PREFIX="armv5b-softfloat-linux-" -EXTRA_CFLAGS_OPTIONS="" -# CONFIG_BUILD_AT_ONCE is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_NO_DEBUG_LIB is not set -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -CONFIG_DEBUG_YANK_SUSv2=y - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -PREFIX="/" - -# -# Busybox Library Tuning -# -CONFIG_MD5_SIZE_VS_SPEED=2 - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y -# CONFIG_CPIO is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -# CONFIG_FEATURE_TAR_LZMA is not set -# CONFIG_FEATURE_TAR_FROM is not set -CONFIG_FEATURE_TAR_GZIP=y -CONFIG_FEATURE_TAR_COMPRESS=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_UNCOMPRESS=y -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# -# Coreutils -# -# CONFIG_BASENAME is not set -# CONFIG_CAL is not set -# CONFIG_CAT is not set -# CONFIG_CHGRP is not set -# CONFIG_CHMOD is not set -# CONFIG_CHOWN is not set -CONFIG_CHROOT=y -# CONFIG_CMP is not set -# CONFIG_COMM is not set -# CONFIG_CP is not set -CONFIG_CUT=y -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -# CONFIG_DD is not set -# CONFIG_DF is not set -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y -# CONFIG_ECHO is not set -# CONFIG_FEATURE_FANCY_ECHO is not set -# CONFIG_ENV is not set -CONFIG_EXPR=y -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -# CONFIG_FALSE is not set -# CONFIG_FOLD is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set -# CONFIG_ID is not set -# CONFIG_INSTALL is not set -# CONFIG_LENGTH is not set -# CONFIG_LN is not set -# CONFIG_LOGNAME is not set -# CONFIG_LS is not set -# CONFIG_FEATURE_LS_FILETYPES is not set -# CONFIG_FEATURE_LS_FOLLOWLINKS is not set -# CONFIG_FEATURE_LS_RECURSIVE is not set -# CONFIG_FEATURE_LS_SORTFILES is not set -# CONFIG_FEATURE_LS_TIMESTAMPS is not set -# CONFIG_FEATURE_LS_USERNAME is not set -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -# CONFIG_MKDIR is not set -CONFIG_MKFIFO=y -# CONFIG_MKNOD is not set -# CONFIG_MV is not set -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -# CONFIG_PRINTF is not set -# CONFIG_PWD is not set -# CONFIG_REALPATH is not set -# CONFIG_RM is not set -CONFIG_RMDIR=y -# CONFIG_SEQ is not set -# CONFIG_SHA1SUM is not set -# CONFIG_SLEEP is not set -# CONFIG_FEATURE_FANCY_SLEEP is not set -CONFIG_SORT=y -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_STTY is not set -# CONFIG_SUM is not set -# CONFIG_SYNC is not set -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -# CONFIG_TEST is not set -# CONFIG_FEATURE_TEST_64 is not set -# CONFIG_TOUCH is not set -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_TRUE is not set -# CONFIG_TTY is not set -CONFIG_UNAME=y -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -# CONFIG_WATCH is not set -# CONFIG_WC is not set -# CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -# CONFIG_YES is not set -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -# CONFIG_FEATURE_HUMAN_READABLE is not set - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -# CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -# CONFIG_RESET is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_SETKEYCODES is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_READLINK is not set -# CONFIG_FEATURE_READLINK_FOLLOW is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_WHICH is not set - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set -CONFIG_SED=y -# CONFIG_VI is not set -# CONFIG_FEATURE_VI_COLON is not set -# CONFIG_FEATURE_VI_YANKMARK is not set -# CONFIG_FEATURE_VI_SEARCH is not set -# CONFIG_FEATURE_VI_USE_SIGNALS is not set -# CONFIG_FEATURE_VI_DOT_CMD is not set -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -# CONFIG_FEATURE_VI_WIN_RESIZE is not set -# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set - -# -# Finding Utilities -# -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -# CONFIG_HALT is not set -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_LOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_E2FSCK is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_MKE2FS is not set -# CONFIG_TUNE2FS is not set -# CONFIG_E2LABEL is not set -# CONFIG_FINDFS is not set - -# -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_RMMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_2_6_MODULES is not set -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# -# Linux System Utilities -# -# CONFIG_DMESG is not set -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -CONFIG_FREERAMDISK=y -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_MKSWAP is not set -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -# CONFIG_READPROFILE is not set -# CONFIG_SETARCH is not set -# CONFIG_SWAPONOFF is not set -# CONFIG_SWITCH_ROOT is not set -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_EJECT is not set -# CONFIG_LAST is not set -# CONFIG_LESS is not set -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_FLAGCS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -# CONFIG_SETSID is not set -# CONFIG_TIME is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_FEATURE_IPV6 is not set -# CONFIG_ARPING is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_HOSTNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_IFCONFIG is not set -# CONFIG_FEATURE_IFCONFIG_STATUS is not set -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -# CONFIG_FEATURE_IFCONFIG_HW is not set -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -# CONFIG_IFUPDOWN is not set -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_IPX is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set -# CONFIG_FEATURE_IP_LINK is not set -# CONFIG_FEATURE_IP_ROUTE is not set -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_NAMEIF is not set -CONFIG_NC=y -# CONFIG_NC_GAPING_SECURITY_HOLE is not set -# CONFIG_NETSTAT is not set -# CONFIG_NSLOOKUP is not set -# CONFIG_PING is not set -# CONFIG_FEATURE_FANCY_PING is not set -# CONFIG_PING6 is not set -# CONFIG_FEATURE_FANCY_PING6 is not set -# CONFIG_ROUTE is not set -# CONFIG_TELNET is not set -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_INETD is not set -# CONFIG_TFTP is not set -# CONFIG_FEATURE_TFTP_GET is not set -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_DEBUG is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -# CONFIG_FEATURE_WGET_STATUSBAR is not set -# CONFIG_FEATURE_WGET_AUTHENTICATION is not set -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set - -# -# udhcp Server/Client -# -# CONFIG_UDHCPD is not set -# CONFIG_UDHCPC is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCP_SYSLOG is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_ZCIP is not set - -# -# Process Utilities -# -CONFIG_FREE=y -# CONFIG_FUSER is not set -# CONFIG_KILL is not set -# CONFIG_KILLALL is not set -# CONFIG_PIDOF is not set -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -# CONFIG_PS is not set -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_UPTIME is not set - -# -# Shells -# -# CONFIG_FEATURE_SH_IS_ASH is not set -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -CONFIG_FEATURE_SH_IS_NONE=y -# CONFIG_ASH is not set -# CONFIG_ASH_JOB_CONTROL is not set -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set -# CONFIG_ASH_ALIAS is not set -# CONFIG_ASH_MATH_SUPPORT is not set -# CONFIG_ASH_MATH_SUPPORT_64 is not set -# CONFIG_ASH_GETOPTS is not set -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_BUILTIN_ECHO is not set -# CONFIG_ASH_MAIL is not set -# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set -# CONFIG_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -# CONFIG_FEATURE_COMMAND_EDITING is not set -# CONFIG_FEATURE_COMMAND_EDITING_VI is not set -CONFIG_FEATURE_COMMAND_HISTORY=0 -# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set -# CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set -# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set -# CONFIG_FEATURE_SH_FANCY_PROMPT is not set - -# -# System Logging Utilities -# -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_KLOGD is not set -# CONFIG_LOGGER is not set diff --git a/packages/busybox/slingbox-1.1.3/lazy_umount.patch b/packages/busybox/slingbox-1.1.3/lazy_umount.patch deleted file mode 100644 index d5156d00d3..0000000000 --- a/packages/busybox/slingbox-1.1.3/lazy_umount.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- busybox-1.1.2/util-linux/umount.c~ 2006-03-22 15:16:26.000000000 -0600 -+++ busybox-1.1.2/util-linux/umount.c 2006-05-15 11:43:23.000000000 -0500 -@@ -21,7 +21,7 @@ - #include <getopt.h> - #include "busybox.h" - --#define OPTION_STRING "flDnrvad" -+#define OPTION_STRING "flDnrvadL" - #define OPT_FORCE 1 - #define OPT_LAZY 2 - #define OPT_DONTFREELOOP 4 -@@ -29,6 +29,7 @@ - #define OPT_REMOUNT 16 - #define OPT_IGNORED 32 // -v is ignored - #define OPT_ALL (ENABLE_FEATURE_UMOUNT_ALL ? 64 : 0) -+#define OPT_LINKSYS_LAZY 256 - - int umount_main(int argc, char **argv) - { -@@ -51,6 +52,8 @@ - argc -= optind; - argv += optind; - -+ if (opt & OPT_LINKSYS_LAZY) opt |= OPT_LAZY; /* -L option same as -l */ -+ - doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY)); - - /* Get a list of mount points from mtab. We read them all in now mostly diff --git a/packages/busybox/slingbox-1.1.3/slingbox.patch b/packages/busybox/slingbox-1.1.3/slingbox.patch deleted file mode 100644 index 3759723bce..0000000000 --- a/packages/busybox/slingbox-1.1.3/slingbox.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- slingbox/applets/install.sh.orig 2006-05-14 18:08:17.000000000 -0500 -+++ slingbox/applets/install.sh 2006-05-14 18:10:40.000000000 -0500 -@@ -33,28 +33,28 @@ - fi - done - fi --rm -f $prefix/bin/busybox || exit 1 -+rm -f $prefix/bin/slingbox || exit 1 - mkdir -p $prefix/bin || exit 1 --install -m 755 busybox $prefix/bin/busybox || exit 1 -+install -m 755 busybox $prefix/bin/slingbox || exit 1 - - for i in $h ; do - appdir=`dirname $i` - mkdir -p $prefix/$appdir || exit 1 - if [ "$2" = "--hardlinks" ]; then -- bb_path="$prefix/bin/busybox" -+ bb_path="$prefix/bin/slingbox" - else - case "$appdir" in - /) -- bb_path="bin/busybox" -+ bb_path="bin/slingbox" - ;; - /bin) -- bb_path="busybox" -+ bb_path="slingbox" - ;; - /sbin) -- bb_path="../bin/busybox" -+ bb_path="../bin/slingbox" - ;; - /usr/bin|/usr/sbin) -- bb_path="../../bin/busybox" -+ bb_path="../../bin/slingbox" - ;; - *) - echo "Unknown installation directory: $appdir" diff --git a/packages/busybox/slingbox-1.1.3/slingbox_name.patch b/packages/busybox/slingbox-1.1.3/slingbox_name.patch deleted file mode 100644 index aeb7221fe2..0000000000 --- a/packages/busybox/slingbox-1.1.3/slingbox_name.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- busybox-1.1.2/applets/applets.c~ 2006-03-22 15:16:25.000000000 -0600 -+++ busybox-1.1.2/applets/applets.c 2006-05-15 11:53:18.000000000 -0500 -@@ -447,6 +447,7 @@ - if(ENABLE_FEATURE_SUID_CONFIG) parse_config_file (); - - if(!strncmp(name, "busybox", 7)) busybox_main(argc, argv); -+ if(!strncmp(name, "slingbox", 8)) busybox_main(argc, argv); - /* Do a binary search to find the applet entry given the name. */ - applet_using = find_applet_by_name(name); - if(applet_using) { diff --git a/packages/busybox/slingbox-1.2.2/defconfig b/packages/busybox/slingbox-1.2.2/defconfig deleted file mode 100644 index 8026cfc2ff..0000000000 --- a/packages/busybox/slingbox-1.2.2/defconfig +++ /dev/null @@ -1,643 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_NITPICK is not set -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_GETOPT_LONG=y -# CONFIG_FEATURE_DEVPTS is not set -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_SUID is not set -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -USING_CROSS_COMPILER=y -CROSS_COMPILER_PREFIX="armeb-linux-" -# CONFIG_BUILD_AT_ONCE is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_NO_DEBUG_LIB is not set -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -CONFIG_DEBUG_YANK_SUSv2=y - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_MD5_SIZE_VS_SPEED=2 - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y -CONFIG_CPIO=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -# CONFIG_FEATURE_TAR_LZMA is not set -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -CONFIG_FEATURE_TAR_COMPRESS=y -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -CONFIG_UNCOMPRESS=y -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_CMP is not set -# CONFIG_COMM is not set -CONFIG_CP=y -CONFIG_CUT=y -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -CONFIG_DD=y -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_BINARY is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_FEATURE_DIFF_MINIMAL is not set -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -# CONFIG_ENV is not set -# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set -CONFIG_EXPR=y -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -# CONFIG_FALSE is not set -# CONFIG_FOLD is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set -CONFIG_ID=y -# CONFIG_INSTALL is not set -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -# CONFIG_FEATURE_MV_LONG_OPTIONS is not set -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -# CONFIG_PRINTF is not set -CONFIG_PWD=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_SEQ is not set -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -CONFIG_SORT=y -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_STTY is not set -# CONFIG_SUM is not set -CONFIG_SYNC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TEST=y -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_TRUE is not set -# CONFIG_TTY is not set -CONFIG_UNAME=y -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -# CONFIG_WATCH is not set -# CONFIG_WC is not set -# CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -# CONFIG_YES is not set - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -# CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -# CONFIG_RESET is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_READLINK is not set -# CONFIG_FEATURE_READLINK_FOLLOW is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -# CONFIG_ED is not set -# CONFIG_PATCH is not set -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -# CONFIG_FEATURE_VI_USE_SIGNALS is not set -# CONFIG_FEATURE_VI_DOT_CMD is not set -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -# CONFIG_FEATURE_VI_WIN_RESIZE is not set -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y - -# -# Finding Utilities -# -CONFIG_FIND=y -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_DEBUG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_HALT=y -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_LOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_E2FSCK is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_MKE2FS is not set -# CONFIG_TUNE2FS is not set -# CONFIG_E2LABEL is not set -# CONFIG_FINDFS is not set - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_RMMOD=y -CONFIG_LSMOD=y -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_2_4_MODULES=y -# CONFIG_FEATURE_2_6_MODULES is not set -CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -CONFIG_FREERAMDISK=y -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -CONFIG_MKSWAP=y -# CONFIG_FEATURE_MKSWAP_V0 is not set -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -# CONFIG_READPROFILE is not set -# CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y -# CONFIG_SWITCH_ROOT is not set -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_CROND is not set -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_EJECT is not set -# CONFIG_LAST is not set -# CONFIG_LESS is not set -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_FLAGCS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -# CONFIG_SETSID is not set -# CONFIG_TASKSET is not set -# CONFIG_TIME is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_FEATURE_IPV6 is not set -# CONFIG_ARPING is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -# CONFIG_IFUPDOWN is not set -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_IPX is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set -# CONFIG_FEATURE_IP_LINK is not set -# CONFIG_FEATURE_IP_ROUTE is not set -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_FEATURE_IP_SHORT_FORMS is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -CONFIG_NC=y -# CONFIG_NC_GAPING_SECURITY_HOLE is not set -# CONFIG_NETSTAT is not set -# CONFIG_NSLOOKUP is not set -CONFIG_PING=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_PING6 is not set -# CONFIG_FEATURE_FANCY_PING6 is not set -CONFIG_ROUTE=y -# CONFIG_TELNET is not set -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_INETD is not set -# CONFIG_TFTP is not set -# CONFIG_FEATURE_TFTP_GET is not set -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_DEBUG_TFTP is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set - -# -# udhcp Server/Client -# -# CONFIG_APP_UDHCPD is not set -# CONFIG_APP_UDHCPC is not set -# CONFIG_APP_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCP_SYSLOG is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -# CONFIG_FEATURE_WGET_STATUSBAR is not set -# CONFIG_FEATURE_WGET_AUTHENTICATION is not set -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -# CONFIG_ZCIP is not set - -# -# Process Utilities -# -CONFIG_FREE=y -# CONFIG_FUSER is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_PIDOF=y -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_UPTIME is not set - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set -# CONFIG_ASH_ALIAS is not set -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -# CONFIG_ASH_GETOPTS is not set -# CONFIG_ASH_BUILTIN_ECHO is not set -# CONFIG_ASH_BUILTIN_TEST is not set -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set -# CONFIG_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -CONFIG_FEATURE_COMMAND_EDITING=y -# CONFIG_FEATURE_COMMAND_EDITING_VI is not set -CONFIG_FEATURE_COMMAND_HISTORY=15 -# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set -CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y -# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set -# CONFIG_FEATURE_SH_FANCY_PROMPT is not set - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_KLOGD=y -# CONFIG_LOGGER is not set diff --git a/packages/busybox/slingbox-1.2.2/df_rootfs.patch b/packages/busybox/slingbox-1.2.2/df_rootfs.patch deleted file mode 100644 index fa7e61af15..0000000000 --- a/packages/busybox/slingbox-1.2.2/df_rootfs.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- busybox-1.2.2/coreutils/df.c.orig 2006-11-11 13:25:00.000000000 -0600 -+++ busybox-1.2.2/coreutils/df.c 2006-11-11 13:23:15.000000000 -0600 -@@ -47,6 +47,7 @@ - struct statfs s; - static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ - const char *disp_units_hdr = hdr_1k; -+ int root_done = 0; - - #ifdef CONFIG_FEATURE_HUMAN_READABLE - bb_opt_complementally = "h-km:k-hm:m-hk"; -@@ -112,16 +113,19 @@ - ) / (blocks_used + s.f_bavail); - } - -- if (strcmp(device, "rootfs") == 0) { -- continue; -- } else if (strcmp(device, "/dev/root") == 0) { -+ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) { - /* Adjusts device to be the real root device, - * or leaves device alone if it can't find it */ -- if ((device = find_block_device("/")) == NULL) { -+ if ((device = find_block_device(mount_point)) == NULL) { - goto SET_ERROR; - } - } - -+ if (strcmp(mount_point, "/") == 0) { -+ if (root_done) continue; -+ root_done = 1; -+ } -+ - #ifdef CONFIG_FEATURE_HUMAN_READABLE - bb_printf("%-20s %9s ", device, - make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); diff --git a/packages/busybox/slingbox-1.2.2/halt.patch b/packages/busybox/slingbox-1.2.2/halt.patch deleted file mode 100644 index c52e35a8d5..0000000000 --- a/packages/busybox/slingbox-1.2.2/halt.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur busybox-1.2.2/init.orig/halt.c busybox-1.2.2/init/halt.c ---- busybox-1.2.2/init.orig/halt.c 2006-11-10 13:39:29.000000000 -0600 -+++ busybox-1.2.2/init/halt.c 2006-11-10 13:39:09.000000000 -0600 -@@ -12,6 +12,8 @@ - #include <sys/reboot.h> - #include <unistd.h> - -+#include "init_shared.h" /* Linksys mods */ -+ - int halt_main(int argc, char *argv[]) - { - static const int magic[] = { -@@ -40,6 +42,12 @@ - if (flags&1) sleep(atoi(delay)); - if (!(flags&2)) sync(); - -+/* Linksys Halt code - adapted from the Linksys source for Busybox. */ -+ rc = bb_shutdown_system(magic[which]); -+ if (rc) bb_error_msg("No."); -+ return rc; /* Shrug */ -+/* End of Linksys code */ -+ - /* Perform action. */ - if (ENABLE_INIT && !(flags & 4)) { - if (ENABLE_FEATURE_INITRD) { -diff -Naur busybox-1.2.2/init.orig/init_shared.c busybox-1.2.2/init/init_shared.c ---- busybox-1.2.2/init.orig/init_shared.c 2006-11-10 13:39:29.000000000 -0600 -+++ busybox-1.2.2/init/init_shared.c 2006-11-10 13:38:37.000000000 -0600 -@@ -62,6 +62,11 @@ - - sync(); - -+/* Linksys Halt code - if poweroff or halt, invoke an external program -+ to do actually turn off the power. */ -+ if (magic != 0x01234567) system("/usr/bin/Set_Led power_off"); -+/* End of Linksys Halt code */ -+ - reboot(magic); - return 0; /* Shrug */ - } diff --git a/packages/busybox/slingbox-1.2.2/lazy_umount.patch b/packages/busybox/slingbox-1.2.2/lazy_umount.patch deleted file mode 100644 index 345272b8c3..0000000000 --- a/packages/busybox/slingbox-1.2.2/lazy_umount.patch +++ /dev/null @@ -1,27 +0,0 @@ ----busybox-1.2.2/util-linux/umount.c~ 2006-11-04 17:59:20.000000000 -0600 -+++ busybox-1.2.2/util-linux/umount.c 2006-11-04 18:03:55.000000000 -0600 -@@ -16,13 +16,14 @@ - #include <errno.h> - #include <getopt.h> - --#define OPTION_STRING "flDnravd" -+#define OPTION_STRING "flDnravdL" - #define OPT_FORCE 1 - #define OPT_LAZY 2 - #define OPT_DONTFREELOOP 4 - #define OPT_NO_MTAB 8 - #define OPT_REMOUNT 16 - #define OPT_ALL (ENABLE_FEATURE_UMOUNT_ALL ? 32 : 0) -+#define OPT_LINKSYS_LAZY 256 - - int umount_main(int argc, char **argv) - { -@@ -45,6 +46,8 @@ - argc -= optind; - argv += optind; - -+ if (opt & OPT_LINKSYS_LAZY) opt |= OPT_LAZY; /* -L same as -l */ -+ - doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY)); - - /* Get a list of mount points from mtab. We read them all in now mostly diff --git a/packages/busybox/slingbox-1.2.2/slingbox.patch b/packages/busybox/slingbox-1.2.2/slingbox.patch deleted file mode 100644 index 15f21ed4d0..0000000000 --- a/packages/busybox/slingbox-1.2.2/slingbox.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- slingbox/applets/install.sh.orig 2006-11-04 18:08:47.000000000 -0600 -+++ slingbox/applets/install.sh 2006-11-04 18:11:46.000000000 -0600 -@@ -39,8 +39,8 @@ - done - fi - --if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/busybox" ]; then -- inode=`ls -i "$prefix/bin/busybox" | awk '{print $1}'` -+if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/slingbox" ]; then -+ inode=`ls -i "$prefix/bin/slingbox" | awk '{print $1}'` - sub_shell_it=` - cd "$prefix" - for d in usr/sbin usr/bin sbin bin ; do -@@ -54,28 +54,28 @@ - ` - fi - --rm -f $prefix/bin/busybox || exit 1 -+rm -f $prefix/bin/slingbox || exit 1 - mkdir -p $prefix/bin || exit 1 --install -m 755 busybox $prefix/bin/busybox || exit 1 -+install -m 755 busybox $prefix/bin/slingbox || exit 1 - - for i in $h ; do - appdir=`dirname $i` - mkdir -p $prefix/$appdir || exit 1 - if [ "$2" = "--hardlinks" ]; then -- bb_path="$prefix/bin/busybox" -+ bb_path="$prefix/bin/slingbox" - else - case "$appdir" in - /) -- bb_path="bin/busybox" -+ bb_path="bin/slingbox" - ;; - /bin) -- bb_path="busybox" -+ bb_path="slingbox" - ;; - /sbin) -- bb_path="../bin/busybox" -+ bb_path="../bin/slingbox" - ;; - /usr/bin|/usr/sbin) -- bb_path="../../bin/busybox" -+ bb_path="../../bin/slingbox" - ;; - *) - echo "Unknown installation directory: $appdir" diff --git a/packages/busybox/slingbox-1.2.2/slingbox_name.patch b/packages/busybox/slingbox-1.2.2/slingbox_name.patch deleted file mode 100644 index aeb7221fe2..0000000000 --- a/packages/busybox/slingbox-1.2.2/slingbox_name.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- busybox-1.1.2/applets/applets.c~ 2006-03-22 15:16:25.000000000 -0600 -+++ busybox-1.1.2/applets/applets.c 2006-05-15 11:53:18.000000000 -0500 -@@ -447,6 +447,7 @@ - if(ENABLE_FEATURE_SUID_CONFIG) parse_config_file (); - - if(!strncmp(name, "busybox", 7)) busybox_main(argc, argv); -+ if(!strncmp(name, "slingbox", 8)) busybox_main(argc, argv); - /* Do a binary search to find the applet entry given the name. */ - applet_using = find_applet_by_name(name); - if(applet_using) { diff --git a/packages/busybox/slingbox-1.2.2/wget-long-options.patch b/packages/busybox/slingbox-1.2.2/wget-long-options.patch deleted file mode 100644 index 3c5920a3cb..0000000000 --- a/packages/busybox/slingbox-1.2.2/wget-long-options.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- busybox-1.2.1.orig/networking/wget.c -+++ busybox-1.2.1/networking/wget.c -@@ -136,7 +136,7 @@ - #define WGET_OPT_PREFIX 32 - #define WGET_OPT_PROXY 64 - --#if ENABLE_WGET_LONG_OPTIONS -+#if CONFIG_FEATURE_WGET_LONG_OPTIONS - static const struct option wget_long_options[] = { - { "continue", 0, NULL, 'c' }, - { "quiet", 0, NULL, 'q' }, -@@ -180,7 +180,7 @@ - * Crack command line. - */ - bb_opt_complementally = "-1:\203::"; --#if ENABLE_WGET_LONG_OPTIONS -+#if CONFIG_FEATURE_WGET_LONG_OPTIONS - bb_applet_long_options = wget_long_options; - #endif - opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:", diff --git a/packages/busybox/slingbox_1.00.bb b/packages/busybox/slingbox_1.00.bb deleted file mode 100644 index e52a1b4eb6..0000000000 --- a/packages/busybox/slingbox_1.00.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \ -to enable ipkg to run on an Unslung NSLU2 device." -HOMEPAGE = "http://www.busybox.net" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "required" -PR = "r10" -COMPATIBLE_MACHINE = "nslu2" - -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://defconfig \ - file://lazy_umount.patch;patch=1 \ - file://slingbox.patch;patch=1" - -S = "${WORKDIR}/busybox-${PV}" - -export EXTRA_CFLAGS = "${CFLAGS}" -EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" - -FILES_${PN} = "/" -FILES_${PN}-doc = "" -FILES_${PN}-dev = "" -FILES_${PN}-locale = "" - -inherit cml1 - -do_configure () { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - cml1_do_configure -} - -do_compile () { - unset CFLAGS - base_do_compile -} - -do_install () { - oe_runmake 'PREFIX=${D}' install -} diff --git a/packages/busybox/slingbox_1.1.3.bb b/packages/busybox/slingbox_1.1.3.bb deleted file mode 100644 index b290841eed..0000000000 --- a/packages/busybox/slingbox_1.1.3.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \ -to enable ipkg to run on an Unslung NSLU2 device." -HOMEPAGE = "http://www.busybox.net" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "required" -PR = "r3" -COMPATIBLE_MACHINE = "nslu2" - -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://defconfig \ - file://Makefile_args.patch;patch=1 \ - file://lazy_umount.patch;patch=1 \ - file://slingbox_name.patch;patch=1 \ - file://slingbox.patch;patch=1" - -S = "${WORKDIR}/busybox-${PV}" - -export EXTRA_CFLAGS = "${CFLAGS}" -EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" - -FILES_${PN} = "/" -FILES_${PN}-doc = "" -FILES_${PN}-dev = "" -FILES_${PN}-locale = "" - -inherit cml1 - -do_configure () { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - cml1_do_configure -} - -do_compile () { - unset CFLAGS - base_do_compile - # Just in case fdisk is compiled in, do not overwrite the Linksys one - sed -i -e '/fdisk/d' ${S}/busybox.links -} - -do_install () { - oe_runmake 'PREFIX=${D}' install -} diff --git a/packages/busybox/slingbox_1.2.2.bb b/packages/busybox/slingbox_1.2.2.bb deleted file mode 100644 index 1a3eaa3985..0000000000 --- a/packages/busybox/slingbox_1.2.2.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \ -to enable ipkg to run on an Unslung NSLU2 device." -HOMEPAGE = "http://www.busybox.net" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "required" -PR = "r4" -COMPATIBLE_MACHINE = "nslu2" - -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://defconfig \ - file://wget-long-options.patch;patch=1 \ - file://lazy_umount.patch;patch=1 \ - file://df_rootfs.patch;patch=1 \ - file://slingbox_name.patch;patch=1 \ - file://halt.patch;patch=1" \ - file://slingbox.patch;patch=1" - -S = "${WORKDIR}/busybox-${PV}" - -export EXTRA_CFLAGS = "${CFLAGS}" -EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" - -FILES_${PN} = "/" -FILES_${PN}-doc = "" -FILES_${PN}-dev = "" -FILES_${PN}-locale = "" - -inherit cml1 - -do_configure () { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe - echo "CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"" > ${S}/.config - echo "USING_CROSS_COMPILER=y" >> ${S}/.config - sed -e '/CROSS_COMPILER_PREFIX/d' \ - -e '/USING_CROSS_COMPILER/d' \ - '${S}/.config.oe' >>'${S}/.config' - cml1_do_configure -} - -do_compile () { - unset CFLAGS - base_do_compile - # Just in case fdisk is compiled in, do not overwrite the Linksys one - sed -i -e '/fdisk/d' ${S}/busybox.links -} - -do_install () { - oe_runmake "PREFIX=${D}" install - cp -pPR ${S}/_install/* ${D}/ -} diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc index 09fc741579..0d2b4c7ae1 100644 --- a/packages/cacao/cacao.inc +++ b/packages/cacao/cacao.inc @@ -13,7 +13,7 @@ RDEPENDS = "classpath" PROVIDES = "cacao virtual/java" RPROVIDES_cacao = "java2-runtime" -inherit autotools update-alternatives +inherit java autotools update-alternatives EXTRA_OECONF = "\ ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \ @@ -41,11 +41,11 @@ do_configure_prepend() { # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory # configured in OE. if [ -e src/vm/properties.c ]; then - sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/properties.c + sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/vm/properties.c fi if [ -e src/vm/properties.c ]; then - sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/vm.c + sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/vm/vm.c fi } diff --git a/packages/cacao/cacao_0.98+hg20071001.bb b/packages/cacao/cacao_0.98+hg20071001.bb index 94919ad24a..878827c28e 100644 --- a/packages/cacao/cacao_0.98+hg20071001.bb +++ b/packages/cacao/cacao_0.98+hg20071001.bb @@ -1,6 +1,6 @@ require cacao.inc -PR = "r7" +PR = "r8" SRC_URI = "\ http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \ diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb index 5f47effd24..62abe88bac 100644 --- a/packages/dcop/dcopidl-native_3.5.4.bb +++ b/packages/dcop/dcopidl-native_3.5.4.bb @@ -4,9 +4,9 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc3-native" -SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl \ +SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 \ file://dcopidl-compile.patch;patch=1 " -S = "${WORKDIR}/dcopidl" +S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl" inherit native qmake qt3e diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb index 2b5cd126d7..d7a1c6e338 100644 --- a/packages/dcop/dcopidl2cpp-native_3.5.4.bb +++ b/packages/dcop/dcopidl2cpp-native_3.5.4.bb @@ -4,10 +4,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc3-native" -SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl2cpp " +SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 " #\ # file://dcopidl-compile.patch;patch=1 " -S = "${WORKDIR}/dcopidl2cpp" +S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl2cpp" inherit native qmake qt3e diff --git a/packages/e17/enna_cvs.bb b/packages/e17/enna_cvs.bb index 7f2c6eb632..4f50b118f3 100644 --- a/packages/e17/enna_cvs.bb +++ b/packages/e17/enna_cvs.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Enna is a media center application based on EFL" LICENSE = "GPL" -DEPENDS = "curl dbus eet evas edje ecore edbus emotion libmusicbrainz libxml2 taglibc" +DEPENDS = "curl dbus eet evas edje ecore edbus emotion" +DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib" SECTION = "x11/multimedia" PV = "0.2.0+cvs${SRCDATE}" diff --git a/packages/efl1/ecore/configure.patch b/packages/efl1/ecore/configure.patch deleted file mode 100644 index 9939bd9d34..0000000000 --- a/packages/efl1/ecore/configure.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: ecore/configure.in -=================================================================== ---- ecore.orig/configure.in 2007-08-20 17:21:13.000000000 +0000 -+++ ecore/configure.in 2007-08-20 17:23:31.000000000 +0000 -@@ -16,7 +16,6 @@ - AC_CHECK_SIZEOF(long, 4) - AM_ENABLE_SHARED - AM_PROG_LIBTOOL --AC_C___ATTRIBUTE__ - - if test "x${bindir}" = 'xNONE'; then - if test "x${prefix}" = "xNONE"; then -@@ -238,9 +237,7 @@ - AC_CHECK_HEADER(X11/X.h, - [ - have_x="yes" -- x_dir=${x_dir:-/usr/X11R6} -- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} -- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" -+ x_libs="${x_libs} -lX11 -lXext" - ] - ) - diff --git a/packages/efl1/ecore/ecore_kernel_input_header.patch b/packages/efl1/ecore/ecore_kernel_input_header.patch deleted file mode 100644 index 99f57ddcff..0000000000 --- a/packages/efl1/ecore/ecore_kernel_input_header.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c -=================================================================== ---- ecore-0.9.9.036.orig/src/lib/ecore_fb/ecore_fb_li.c 2006-09-05 01:36:43.000000000 +0100 -+++ ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c 2006-12-02 21:55:54.000000000 +0000 -@@ -1,6 +1,18 @@ - #include "Ecore_Fb.h" - #include "ecore_fb_private.h" - -+struct input_absinfo { -+ __s32 value; -+ __s32 minimum; -+ __s32 maximum; -+ __s32 fuzz; -+ __s32 flat; -+}; -+ -+ -+#define EV_SYN 0x00 -+#define EV_PWR 0x16 -+#define EV_FF_STATUS 0x17 - - /* Copyright (C) Brad Hards (1999-2002). - * this macro is used to tell if "bit" is set in "array" diff --git a/packages/efl1/ecore/fix-tslib-configure.patch b/packages/efl1/ecore/fix-tslib-configure.patch deleted file mode 100644 index a1fbb21326..0000000000 --- a/packages/efl1/ecore/fix-tslib-configure.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: ecore-0.9.9.038/configure.in -=================================================================== ---- ecore-0.9.9.038.orig/configure.in -+++ ecore-0.9.9.038/configure.in -@@ -1,4 +1,4 @@ --dnl Process this file with autoconf to produce a configure script. -+<dnl Process this file with autoconf to produce a configure script. - - AC_INIT(configure.in) - AC_CANONICAL_BUILD -@@ -321,7 +321,7 @@ tslib_libs="" - if test "x$have_ecore_fb" = "xyes" ; then - AC_CHECK_HEADER(tslib.h, - [ -- tslib_libs="-ltslib" -+ tslib_libs="-lts" - AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) - ] - ) diff --git a/packages/efl1/ecore/remove-bad-code.patch b/packages/efl1/ecore/remove-bad-code.patch deleted file mode 100644 index 87a8d16bd6..0000000000 --- a/packages/efl1/ecore/remove-bad-code.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h -=================================================================== ---- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_private.h -+++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h -@@ -19,8 +19,8 @@ - #define kernel_ulong_t unsigned long - #define BITS_PER_LONG 32 - #include <linux/input.h> -- #undef kernel_ulong_t <-added -- #undef BITS_PER_LONG <-added -+ #undef kernel_ulong_t -+ #undef BITS_PER_LONG - #else - #include <linux/input.h> - #endif -Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c -=================================================================== ---- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_li.c -+++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c -@@ -1,6 +1,6 @@ - #include "Ecore_Fb.h" - #include "ecore_fb_private.h" -- -+/* - struct input_absinfo { - __s32 value; - __s32 minimum; -@@ -8,7 +8,7 @@ struct input_absinfo { - __s32 fuzz; - __s32 flat; - }; -- -+*/ - - #define EV_SYN 0x00 - #define EV_PWR 0x16 diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index 237971c9c7..d2630e5e43 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -3,7 +3,7 @@ SECTION = "console/network" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "dbus-glib ncurses python" -RDEPENDS = "gpsd-conf" +RDEPENDS_${PN} = "gpsd-conf gpsd-gpsctl" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ @@ -12,12 +12,12 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \ file://gpsd-default \ - file://gps-hardware \ + file://gps-hardware \ file://gpsd" SRC_URI_append_fic-gta01 = " \ - file://restart_gllin.sh \ - " + file://restart_gllin.sh \ +" inherit autotools update-rc.d @@ -47,7 +47,7 @@ do_install_append() { install -d ${D}/${sysconfdir}/init.d install -d ${D}/dev install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/gps-hardware ${D}/${sysconfdir}/init.d/gps-hardware.default + install -m 0755 ${WORKDIR}/gps-hardware ${D}/${sysconfdir}/init.d/gps-hardware.default install -d ${D}/${sysconfdir}/default install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default } @@ -69,14 +69,18 @@ pkg_postrm_${PN}-conf() { SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -PACKAGES =+ "libgps python-pygps gpsd-conf" +PACKAGES =+ "libgps python-pygps gpsd-conf gpsd-gpsctl gps-utils" PACKAGE_ARCH_gpsd-conf = "${MACHINE_ARCH}" FILES_libgps = "${libdir}/*.so.*" FILES_gpsd-conf = "${sysconfdir}" +FILES_gpsd-gpsctl = "${bindir}/gpsctl" +FILES_gps-utils = "${bindir}/*" +# might split them up even more fine granular +RDEPENDS_gps-utils = "python-pygps" DESCRIPTION_python-pygps = "Python bindings to gpsd" FILES_python-pygps = "${libdir}/*/site-packages/*" -RDEPENDS_python-pygps = "python-core gpsd" +RDEPENDS_python-pygps = "python-core python-ncurses gpsd" diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb index 7094893b99..d5a02e27b4 100644 --- a/packages/gpsd/gpsd_2.28.bb +++ b/packages/gpsd/gpsd_2.28.bb @@ -1,2 +1,3 @@ require gpsd.inc -PR = "r8" + +PR = "r9" diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb index ea9fe4f550..8e46cb01eb 100644 --- a/packages/gpsd/gpsd_2.34.bb +++ b/packages/gpsd/gpsd_2.34.bb @@ -1,4 +1,4 @@ require gpsd.inc -PR = "r8" +PR = "r9" diff --git a/packages/gpsd/gpsd_2.36.bb b/packages/gpsd/gpsd_2.36.bb index 726ba42481..b3cc2f1f19 100644 --- a/packages/gpsd/gpsd_2.36.bb +++ b/packages/gpsd/gpsd_2.36.bb @@ -1,3 +1,3 @@ require gpsd.inc -PR = "r2" +PR = "r4" diff --git a/packages/jamvm/files/debian-jni.patch b/packages/jamvm/files/debian-jni.patch new file mode 100644 index 0000000000..040163da69 --- /dev/null +++ b/packages/jamvm/files/debian-jni.patch @@ -0,0 +1,19 @@ +--- src/dll.c.orig 2004-09-09 15:48:45.000000000 +0000 ++++ src/dll.c 2004-09-09 15:50:32.000000000 +0000 +@@ -189,6 +189,16 @@ + #ifndef NO_JNI + /* Init hash table, and create lock */ + initHashTable(hash_table, HASHTABSZE, TRUE); ++ ++ /* XXX: Add Debian JNI directory. */ ++ char* path = getenv("LD_LIBRARY_PATH"); ++ ++ if (path != NULL) ++ path = strcat(path, ":OE_LIBDIR_JNI"); ++ else ++ path = "OE_LIBDIR_JNI"; ++ ++ setenv("LD_LIBRARY_PATH", path, 1); + #endif + } + diff --git a/packages/jamvm/jamvm.inc b/packages/jamvm/jamvm.inc index 36378370c5..930159e891 100644 --- a/packages/jamvm/jamvm.inc +++ b/packages/jamvm/jamvm.inc @@ -12,7 +12,7 @@ RPROVIDES_jamvm = "java2-runtime" # This uses 32 bit arm, so force the instruction set to arm, not thumb ARM_INSTRUCTION_SET = "arm" -inherit autotools update-alternatives +inherit java autotools update-alternatives EXTRA_OECONF = "--with-classpath-install-dir=${prefix}" CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" diff --git a/packages/jamvm/jamvm_1.5.0.bb b/packages/jamvm/jamvm_1.5.0.bb index efa959f0f9..366658dd97 100644 --- a/packages/jamvm/jamvm_1.5.0.bb +++ b/packages/jamvm/jamvm_1.5.0.bb @@ -1,5 +1,12 @@ require jamvm.inc -PR = "r0" +SRC_URI += "file://debian-jni.patch;patch=1;pnum=0" +PR = "r1" + +do_configure_prepend() { + # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory + # configured in OE. + sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/dll.c +} diff --git a/packages/klibc/files/klibc-config-eabi.patch b/packages/klibc/files/klibc-config-eabi.patch new file mode 100644 index 0000000000..86517f0594 --- /dev/null +++ b/packages/klibc/files/klibc-config-eabi.patch @@ -0,0 +1,9 @@ +diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig +--- klibc-1.5/defconfig 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5p/defconfig 2008-02-08 19:24:22.337127756 +0100 +@@ -5,4 +5,4 @@ + CONFIG_REGPARM=y + # ARM options + # CONFIG_KLIBC_THUMB is not set +-# CONFIG_AEABI is not set ++CONFIG_AEABI=y diff --git a/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb index 17db23305d..bbb3248158 100644 --- a/packages/klibc/klibc-utils-static_1.5.bb +++ b/packages/klibc/klibc-utils-static_1.5.bb @@ -4,6 +4,9 @@ PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2" +SRC_URI_append_linux-gnueabi = "\ + file://klibc-config-eabi.patch;patch=1" + EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ 'CROSS_COMPILE=${TARGET_PREFIX}' \ " @@ -36,7 +39,6 @@ do_install() { install -m 755 usr/utils/static/uname ${D}${base_bindir} } -PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES = "klibc-utils-static-sh klibc-utils-static-gzip \ klibc-utils-static-cat klibc-utils-static-chroot \ klibc-utils-static-cpio klibc-utils-static-dd \ @@ -71,11 +73,3 @@ FILES_klibc-utils-static-sleep = "${base_bindir}/sleep" FILES_klibc-utils-static-true = "${base_bindir}/true" FILES_klibc-utils-static-umount = "${base_bindir}/umount" FILES_klibc-utils-static-uname = "${base_bindir}/uname" - -# the klibc code contains ARM instructions (for ARM), this -# could be fixed, but for the moment: -ARM_INSTRUCTION_SET = "arm" - -KLIBC_ARCH = "'${TARGET_ARCH}'" -KLIBC_ARCH_armeb = "'arm'" -KLIBC_ARCH_mipsel = "'mips'" diff --git a/packages/libxml/libxml++_2.14.0.bb b/packages/libxml/libxml++_2.14.0.bb index 4a5af16ea3..71a4de2bdb 100644 --- a/packages/libxml/libxml++_2.14.0.bb +++ b/packages/libxml/libxml++_2.14.0.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" -DEPENDS = "gtk+" +DEPENDS = "gtk+ glibmm" inherit gnome pkgconfig diff --git a/packages/busybox/busybox-1.7.2/files/.mtn2git_empty b/packages/lightmediascanner/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/busybox/busybox-1.7.2/files/.mtn2git_empty +++ b/packages/lightmediascanner/.mtn2git_empty diff --git a/packages/lightmediascanner/lightmediascanner_svn.bb b/packages/lightmediascanner/lightmediascanner_svn.bb new file mode 100644 index 0000000000..702dcbe3f3 --- /dev/null +++ b/packages/lightmediascanner/lightmediascanner_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Lightweight media scanner meant to be used in not-so-powerful devices" +SECTION = "libs/multimedia" +HOMEPAGE = "http://lms.garage.maemo.org/" +AUTHOR = "Gustavo Barbieri" +LICENSE = "LGPL" +DEPENDS = "sqlite3" +PV = "0.1.0+svn${SRCREV}" + +SRC_URI = "svn://garage.maemo.org/svn/lms/;module=lightmediascanner;proto=https" +S = "${WORKDIR}/lightmediascanner" + +inherit autotools pkgconfig + +FILES_${PN}-dbg += "${libdir}/${PN}/plugins/.debug" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/busybox/slingbox-1.00/.mtn2git_empty b/packages/logic-analyzer/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/busybox/slingbox-1.00/.mtn2git_empty +++ b/packages/logic-analyzer/.mtn2git_empty diff --git a/packages/busybox/slingbox-1.1.3/.mtn2git_empty b/packages/logic-analyzer/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/busybox/slingbox-1.1.3/.mtn2git_empty +++ b/packages/logic-analyzer/files/.mtn2git_empty diff --git a/packages/logic-analyzer/files/client-makefile.patch b/packages/logic-analyzer/files/client-makefile.patch new file mode 100644 index 0000000000..7b0b4b88ce --- /dev/null +++ b/packages/logic-analyzer/files/client-makefile.patch @@ -0,0 +1,426 @@ +Index: LogicAnalyzer/client/Makefile +=================================================================== +--- LogicAnalyzer.orig/client/Makefile 2008-02-09 02:27:13.000000000 +0100 ++++ LogicAnalyzer/client/Makefile 2008-02-09 02:28:34.000000000 +0100 +@@ -1,8 +1,412 @@ +-all: +- jar cfm analyzer.jar \ +- Manifest.txt \ +- org/sump/analyzer/*.class \ +- org/sump/analyzer/tools/*.class \ +- org/sump/analyzer/icons/*.png \ +- org/sump/util/*.class \ +- +\ No newline at end of file ++# ++# Makefile created at Fri Feb 8 23:36:42 2008, by mmake ++# ++ ++# Programs (with common options): ++SHELL = /bin/sh ++CP = cp ++RM = rm -f ++MV = mv -f ++SED = sed ++ETAGS = etags ++XARGS = xargs ++CAT = cat ++FIND = find ++CPP = cpp -C -P ++ ++INSTALL = install ++INSTALL_PROG = $(INSTALL) -m $(MODE_PROGS) ++INSTALL_FILE = $(INSTALL) -m $(MODE_FILES) ++INSTALL_DIR = $(INSTALL) -m $(MODE_DIRS) -d ++ ++# Install modes ++MODE_PROGS = 555 ++MODE_FILES = 444 ++MODE_DIRS = 2755 ++ ++# Build programs ++JAVAC = ecj ++JAVADOC = javadoc ++JAR = fastjar ++ ++# Build flags ++JAVAC_FLAGS = ++JAVADOC_FLAGS = -version -author ++JAR_FLAGS = cvf0 ++JIKES_DEP_FLAG = +M ++ ++# ------------------------------------------------------------------- # ++ ++# Prefix for every install directory ++PREFIX = ++ ++# Where to start installing the class files. Set this to an empty value ++# if you dont want to install classes ++CLASS_DIR = $(PREFIX)classes ++ ++# The directory to install the jar file in. Set this to an empty value ++# if you dont want to install a jar file ++JAR_DIR = $(PREFIX)lib ++ ++# The directory to install the app bundle in. Set this to an empty value ++# if you dont want to install an app bundle ++BUNDLE_DIR = $(PREFIX)lib ++ ++ ++# The directory to install html files generated by javadoc ++DOC_DIR = $(PREFIX)doc/api-docs ++ ++# The directory to install script files in ++SCRIPT_DIR = $(PREFIX)bin ++ ++# ------------------------------------------------------------------- # ++ ++# The name of the jar file to install ++JAR_FILE = analyzer.jar ++ ++# ++# The VERSION variable below should be set to a value ++# that will be tested in the .xjava code and Info.plist. ++# ++VERSION = CHANGE_ME ++ ++# ------------------------------------------------------------------- # ++ ++# The name of the OS X Application Bundle to install ++BUNDLE_FILE = ++ ++# Folder containing App Bundle resources (Info.plist, *.icns, etc.) ++BUNDLE_RESOURCE_DIR = misc/macosx ++ ++# Items to copy to the Resources folder of the bundle ++BUNDLE_RESOURCES = $(addsuffix .icns, $(basename $(APP_FILE)) Document) ++ ++# Location of JavaApplicatonStub ++JAVA_STUB = /System/Library/Frameworks/JavaVM.framework/Resources/MacOS/JavaApplicationStub ++ ++# ------------------------------------------------------------------- # ++ ++# Resource files: ++# Extend the list to install other files of your choice ++RESOURCE_SRC := *.properties *.gif *.au ++ ++# Objects that should go into the jar file. (find syntax) ++JAR_OBJS := \( -name '*.class' -o -name '*.gif' -o -name "*.au" \ ++ -o -name '*.properties' \ ++ -o -name '*.png' \) ++ ++# Include the separate variables file if it exists ++MAKEFILE_VARS = makefile.vars ++VARS = $(wildcard $(MAKEFILE_VARS)) ++ifneq ($(VARS),) ++ include $(MAKEFILE_VARS) ++endif ++ ++ ++# Packages we should compile ++PACKAGES = \ ++ org.sump.analyzer.tools \ ++ org.sump.util \ ++ org.sump.analyzer ++ ++ ++# All packages that can be recursively compiled. ++ALL_PACKAGES = \ ++ org \ ++ org.sump \ ++ $(PACKAGES) ++ ++ ++# Packages to generate docs for. ++JAVADOC_PACKAGES = $(PACKAGES) ++ ++ ++# Resource packages ++RESOURCES = \ ++ doc.resources ++ ++ ++# Directories with shell scripts ++SCRIPTS = ++ ++# ------------------------------------------------------------------- # ++ ++# A marker variable for the top level directory ++TOPLEVEL := . ++ ++# Subdirectories with java files: ++JAVA_DIRS := $(subst .,/,$(PACKAGES)) $(TOPLEVEL) ++ ++# Subdirectories with only resource files: ++RESOURCE_DIRS := $(subst .,/,$(RESOURCES)) ++ ++# All the .xjava source files: ++XJAVA_SRC := $(foreach dir, $(JAVA_DIRS), $(wildcard $(dir)/*.xjava)) ++ ++# All the xjava files to build ++XJAVA_OBJS := $(XJAVA_SRC:.xjava=.java) ++ ++# Directory coresponding to a package ++PACKAGE_DIR = $(subst .,/,$(1)) ++ ++# All the (x)java files in a package ++PACKAGE_SRC = $(shell $(FIND) $(PACKAGE_DIR) \( -name '*.java' -or -name '*.xjava' \) ) ++ ++# All the classes to build in a package ++PACKAGE_OBJS = $(patsubst %.java,%.class,$(PACKAGE_SRC: %.xjava=%.java)) ++ ++# All the .java source files: ++JAVA_SRC := $(foreach dir, $(JAVA_DIRS), $(wildcard $(dir)/*.java)) ++JAVA_SRC := $(XJAVA_OBJS) $(JAVA_SRC) ++ ++# Dependency files: ++DEPEND_OBJS := $(JAVA_SRC:.java=.u) ++ ++# The intermediate java files and main classes we should build: ++JAVA_OBJS := $(XJAVA_OBJS) $(JAVA_SRC:.java=.class) ++ ++# Search for resource files in both JAVA_DIRS and RESOURCE_DIRS ++RESOURCE_OBJS := $(foreach dir, $(JAVA_DIRS) $(RESOURCE_DIRS), \ ++ $(wildcard $(foreach file, $(RESOURCE_SRC), \ ++ $(dir)/$(file)))) ++ ++# All the shell scripts source ++SCRIPT_SRCS := $(foreach dir, $(SCRIPTS), $(wildcard $(dir)/*.sh)) ++# All shell scripts we should install ++SCRIPT_OBJS := $(SCRIPT_SRCS:.sh=) ++ ++# All the files to install into CLASS_DIR ++INSTALL_OBJS := $(foreach dir, $(JAVA_DIRS), $(wildcard $(dir)/*.class)) ++# Escape inner class delimiter $ ++INSTALL_OBJS := $(subst $$,\$$,$(INSTALL_OBJS)) ++# Add the resource files to be installed as well ++INSTALL_OBJS := $(INSTALL_OBJS) $(RESOURCE_OBJS) ++ ++ ++# ------------------------------------------------------------------- # ++ ++ ++define check-exit ++|| exit 1 ++ ++endef ++ ++ ++# ----------- ++# Build Rules ++# ----------- ++ ++%.java: %.xjava ++ $(CPP) -D$(VERSION) $< $@ ++ ++%.class: %.java ++ $(JAVAC) $(JAVAC_FLAGS) $< ++ ++%.jar: $(JAVA_OBJS) $(RESOURCE_OBJS) ++ $(FIND) $(TOPLEVEL) $(JAR_OBJS) -print | $(XARGS) \ ++ $(JAR) $(JAR_FLAGS) $(JAR_FILE) ++ ++%.u: %.java ++ $(JAVAC) $(JIKES_DEP_FLAG) $< ++ ++ ++# ------- ++# Targets ++# ------- ++ ++.PHONY: all jar install uninstall doc clean depend tags bundle \ ++ help $(ALL_PACKAGES) ++ ++all:: $(JAVA_OBJS) ++ ++help: ++ @echo "Usage: make {all|jar|srcjar|bundle|install|uninstall|doc|clean|depend|tags|PACKAGE_NAME}" ++ @echo " all: build all classes" ++ @echo " jar: build jar file" ++ @echo " srcjar: build source jar file" ++ @echo " bundle: build OS X app bundle" ++ @echo " install: install classes into $(CLASS_DIR)" ++ @echo " jar into $(JAR_DIR)" ++ @echo " bundle into $(BUNDLE_DIR)" ++ @echo " javadocs into $(DOC_DIR)" ++ @echo " scripts into $(SCRIPT_DIR)" ++ @echo " uninstall: remove installed files" ++ @echo " doc: generate api docs from javadoc comments" ++ @echo " clean: remove classes and temporary files" ++ @echo " depend: build class dependency info using jikes" ++ @echo " tags: build emacs tags file" ++ @echo " PACKAGE_NAME: builds all classes in this package and any subpackages." ++ ++# Jar target ++ifneq ($(strip $(JAR_FILE)),) ++jar: $(JAR_FILE) ++ifneq ($(strip $(JAR_DIR)),) ++install:: $(JAR_FILE) ++ @echo "===> [Installing jar file, $(JAR_FILE) in $(JAR_DIR)] " ++ $(INSTALL_DIR) $(JAR_DIR) $(check-exit) ++ $(INSTALL_FILE) $(JAR_FILE) $(JAR_DIR) $(check-exit) ++uninstall:: ++ @echo "===> [Removing jar file, $(JAR_FILE) from $(JAR_DIR)] " ++ $(RM) $(JAR_DIR)/$(JAR_FILE) $(check-exit) ++else ++install:: ++ @echo "No jar install dir defined" ++endif ++clean:: ++ $(RM) $(JAR_FILE) ++else ++jar: ++ @echo "No jar file defined" ++endif ++ ++SRC_JAR_FILE := $(basename $(JAR_FILE))-src$(suffix $JAR_FILE) ++ ++# Source jar target ++srcjar : $(SRC_JAR_FILE) ++$(SRC_JAR_FILE): $(JAVA_SRC) $(RESOURCE_OBJS) ++ $(FIND) $(TOPLEVEL) $(JAR_OBJS: .class=.java) -print | $(XARGS) \ ++ $(JAR) $(JAR_FLAGS) $@ ++ ++# Bundle target ++ifneq ($(strip $(BUNDLE_FILE)),) ++bundle: $(BUNDLE_FILE) ++$(BUNDLE_FILE) : $(JAR_FILE) ++ $(INSTALL_DIR) $(BUNDLE_FILE)/Contents/Resources/Java $(check-exit) ++ $(INSTALL_DIR) $(BUNDLE_FILE)/Contents/MacOS $(check-exit) ++ $(INSTALL_PROG) $(JAVA_STUB) $(BUNDLE_FILE)/Contents/MacOS/ \ ++ $(check-exit) ++ ( $(CAT) $(BUNDLE_RESOURCE_DIR)/Info.plist | $(SED) -e \ ++ s/VERSION/$(VERSION)/ >98762infoplist876 ) $(check-exit) ++ $(INSTALL_FILE) 98762infoplist876 \ ++ $(BUNDLE_FILE)/Contents/Info.plist $(check-exit) ++ $(RM) 98762infoplist876 $(check-exit) ++ $(INSTALL_FILE) $(JAR_FILE) $(BUNDLE_FILE)/Contents/Resources/Java ++ checkexit="";for f in $(BUNDLE_RESOURCES); do \ ++ $(INSTALL_FILE) $(BUNDLE_RESOURCE_DIR)$$f $(BUNDLE_FILE)/Contents/Resources/ \ ++ || checkexit=$?; \ ++ done; test -z $$checkexit ++ ++ifneq ($(strip $(BUNDLE_DIR)),) ++# This is probably bad, but I don't know how else to do it ++install:: $(BUNDLE_FILE) ++ @echo "===> [Installing app bundle, $(BUNDLE_FILE) in $(BUNDLE_DIR)] " ++ $(INSTALL_DIR) $(BUNDLE_DIR) $(check-exit) ++ $(CP) -R $(BUNDLE_FILE) $(BUNDLE_DIR) $(check-exit) ++ $(INSTALL_FILE) $(BUNDLE_FILE) $(BUNDLE_DIR) $(check-exit) ++uninstall:: ++ @echo "===> [Removing bundle file, $(BUNDLE_FILE) from $(BUNDLE_DIR)] " ++ $(RM) -r $(BUNDLE_DIR)/$(BUNDLE_FILE) $(check-exit) ++else ++install:: ++ @echo "No bundle install dir defined" ++endif ++clean:: ++ $(RM) -r $(BUNDLE_FILE) ++else ++bundle: ++ @echo "No bundle file defined" ++endif ++ ++ ++# Install target for Classes and Resources ++ifneq ($(strip $(CLASS_DIR)),) ++install:: $(JAVA_OBJS) ++ @echo "===> [Installing classes in $(CLASS_DIR)] " ++ $(INSTALL_DIR) $(CLASS_DIR) $(check-exit) ++ $(foreach dir, $(JAVA_DIRS) $(RESOURCE_DIRS), \ ++ $(INSTALL_DIR) $(CLASS_DIR)/$(dir) $(check-exit)) ++ $(foreach file, $(INSTALL_OBJS), \ ++ $(INSTALL_FILE) $(file) $(CLASS_DIR)/$(file) \ ++ $(check-exit)) ++uninstall:: ++ @echo "===> [Removing class-files from $(CLASS_DIR)] " ++ $(foreach file, $(INSTALL_OBJS), \ ++ $(RM) $(CLASS_DIR)/$(file) \ ++ $(check-exit)) ++else ++# Print a warning here if you like. (No class install dir defined) ++endif ++ ++ ++ ++# Depend target ++ifeq ($(findstring jikes,$(JAVAC)),jikes) ++depend: $(XJAVA_OBJS) $(DEPEND_OBJS) ++ ( $(CAT) $(DEPEND_OBJS) | $(SED) -e '/\.class$$/d' \ ++ -e '/.*$$.*/d' > $(MAKEFILE_DEPEND); $(RM) $(DEPEND_OBJS); ) ++else ++depend: ++ @echo "mmake needs the jikes compiler to build class dependencies" ++endif ++ ++ ++ ++# Doc target ++ifneq ($(strip $(JAVADOC_PACKAGES)),) ++doc: $(JAVA_SRC) ++ @echo "===> [Installing java documentation in $(DOC_DIR)] " ++ $(INSTALL_DIR) $(DOC_DIR) $(check-exit) ++ $(JAVADOC) $(JAVADOC_FLAGS) -d $(DOC_DIR) $(JAVADOC_PACKAGES) ++else ++doc: ++ @echo "You must put your source files in a package to run make doc" ++endif ++ ++ ++ ++# Script target ++ifneq ($(strip $(SCRIPT_OBJS)),) ++all:: $(SCRIPT_OBJS) ++ifneq ($(strip $(SCRIPT_DIR)),) ++install:: $(SCRIPT_OBJS) ++ @echo "===> [Installing shell-scripts in $(SCRIPT_DIR)] " ++ $(INSTALL_DIR) $(SCRIPT_DIR) $(check-exit) ++ $(foreach file, $(SCRIPT_OBJS), \ ++ $(INSTALL_PROG) $(file) $(SCRIPT_DIR) $(check-exit)) ++uninstall:: ++ @echo "===> [Removing shell-scripts from $(SCRIPT_DIR)] " ++ $(foreach file, $(SCRIPT_OBJS), \ ++ $(RM) $(SCRIPT_DIR)/$(file) $(check-exit)) ++else ++# Print a warning here if you like. (No script install dir defined) ++endif ++clean:: ++ rm -f $(SCRIPT_OBJS) ++endif ++ ++ ++ ++# Tag target ++tags: ++ @echo "Tagging" ++ $(ETAGS) $(filter-out $(XJAVA_OBJS), $(JAVA_SRC)) $(XJAVA_SRC) ++ ++ ++ ++# Various cleanup routines ++clean:: ++ $(FIND) . \( -name '*~' -o -name '*.class' \) -print | \ ++ $(XARGS) $(RM) ++ $(FIND) . -name '*.u' -print | $(XARGS) $(RM) ++ ++ifneq ($(strip $(XJAVA_SRC)),) ++clean:: ++ $(RM) $(XJAVA_OBJS) ++endif ++ ++# ---------------------------------------- ++# Include the dependency graph if it exist ++# ---------------------------------------- ++MAKEFILE_DEPEND = makefile.dep ++DEPEND = $(wildcard $(MAKEFILE_DEPEND)) ++ifneq ($(DEPEND),) ++ include $(MAKEFILE_DEPEND) ++endif ++ ++#package targets ++org : $(call PACKAGE_OBJS,org) ++org.sump : $(call PACKAGE_OBJS,org.sump) ++org.sump.analyzer.tools : $(call PACKAGE_OBJS,org.sump.analyzer.tools) ++org.sump.util : $(call PACKAGE_OBJS,org.sump.util) ++org.sump.analyzer : $(call PACKAGE_OBJS,org.sump.analyzer) ++ diff --git a/packages/logic-analyzer/files/cp-run-fix.patch b/packages/logic-analyzer/files/cp-run-fix.patch new file mode 100644 index 0000000000..401f3bb6e0 --- /dev/null +++ b/packages/logic-analyzer/files/cp-run-fix.patch @@ -0,0 +1,26 @@ +Index: LogicAnalyzer/client/org/sump/analyzer/Loader.java +=================================================================== +--- LogicAnalyzer.orig/client/org/sump/analyzer/Loader.java 2008-02-08 23:34:14.000000000 +0100 ++++ LogicAnalyzer/client/org/sump/analyzer/Loader.java 2008-02-08 23:46:40.000000000 +0100 +@@ -90,12 +90,19 @@ + } + } + +- try { +- SwingUtilities.invokeAndWait(w); ++// try { ++ ++ /* Constructing and running the GUI from withing the Swing thread ++ is right and nice but does not work in Classpath (yet): ++ */ ++// SwingUtilities.invokeAndWait(w); ++ w.run(); ++/* + } catch (Exception e) { + System.out.println("Error while invoking application: " + e.getMessage() + "\n"); + e.printStackTrace(); + System.exit(-1); + } ++*/ + } + } diff --git a/packages/logic-analyzer/logic-analyzer_0.8.bb b/packages/logic-analyzer/logic-analyzer_0.8.bb new file mode 100644 index 0000000000..ce691093fa --- /dev/null +++ b/packages/logic-analyzer/logic-analyzer_0.8.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "A Java-based logical analyzer for home use." +LICENSE = "GPL" +MAINTAINER = "Robert Schuster, tarent GmbH Bonn <robert.schuster@tarent.de>" +HOMEPAGE = "http://sump.org/projects/analyzer/" + +inherit java + +DEPENDS = "rxtx" +RDEPENDS = "librxtx-java" + +SRC_URI = "\ + http://sump.org/projects/analyzer/downloads/la-src-${PV}.tar.bz2 \ + file://cp-run-fix.patch;patch=1 \ + file://client-makefile.patch;patch=1 \ + " + +S = "${WORKDIR}/LogicAnalyzer" + +do_compile() { + + oe_runmake -C client all jar \ + JAVAC_FLAGS="-sourcepath . -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip -classpath ${STAGING_DATADIR}/java/RXTXcomm.jar" + + oe_java_simple_wrapper org.sump.analyzer.Loader analyzer.jar RXTXcomm.jar +} + +do_install() { + oe_jarinstall client/analyzer.jar + + install -d ${D}${bindir} + install -m 0555 ${PN} ${D}${bindir} +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${datadir_java}/analyzer.jar ${bindir}/${PN}" + +PACKAGE_ARCH = "all" diff --git a/packages/musicbrainz/libmusicbrainz_2.1.4.bb b/packages/musicbrainz/libmusicbrainz_2.1.4.bb deleted file mode 100644 index 7ab0997218..0000000000 --- a/packages/musicbrainz/libmusicbrainz_2.1.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \ -It allows you to access the data held on the MusicBrainz server." -HOMEPAGE = "http://musicbrainz.org" -LICENSE = "LGPL" -DEPENDS = "expat" - -SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/php/php-native_4.4.4.bb b/packages/php/php-native_4.4.4.bb index 07b13be93a..84d1c667b5 100644 --- a/packages/php/php-native_4.4.4.bb +++ b/packages/php/php-native_4.4.4.bb @@ -3,4 +3,6 @@ require php_${PV}.bb inherit native FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" DEPENDS = "zlib-native" -PR = "r1" +PR = "r2" + +S = "${WORKDIR}/php-${PV}" diff --git a/packages/php/php-native_5.2.0.bb b/packages/php/php-native_5.2.0.bb index b3bf7b56b4..b04103c90b 100644 --- a/packages/php/php-native_5.2.0.bb +++ b/packages/php/php-native_5.2.0.bb @@ -6,4 +6,6 @@ export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" DEPENDS = "zlib-native libxml2-native" -PR = "r1" +PR = "r2" + +S = "${WORKDIR}/php-${PV}" diff --git a/packages/poppler/poppler_0.5.4.bb b/packages/poppler/poppler_0.5.4.bb deleted file mode 100644 index 754eccf435..0000000000 --- a/packages/poppler/poppler_0.5.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -require poppler.inc -PR = "r3" diff --git a/packages/poppler/poppler_0.6.2.bb b/packages/poppler/poppler_0.6.4.bb index 3c1ec00183..3c1ec00183 100644 --- a/packages/poppler/poppler_0.6.2.bb +++ b/packages/poppler/poppler_0.6.4.bb diff --git a/packages/poppler/poppler_0.6.bb b/packages/poppler/poppler_0.6.bb deleted file mode 100644 index 3c1ec00183..0000000000 --- a/packages/poppler/poppler_0.6.bb +++ /dev/null @@ -1,6 +0,0 @@ -require poppler.inc - -PR = "r0" - -EXTRA_OECONF_append = " --disable-abiword-output " - diff --git a/packages/python/python-lightmediascanner_svn.bb b/packages/python/python-lightmediascanner_svn.bb new file mode 100644 index 0000000000..27d0bb62f1 --- /dev/null +++ b/packages/python/python-lightmediascanner_svn.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Python bindings to the Lightweight media scanner" +SECTION = "devel/python" +HOMEPAGE = "http://lms.garage.maemo.org/" +AUTHOR = "Gustavo Barbieri" +LICENSE = "LGPL" +DEPENDS = "lightmediascanner" +PV = "0.1.0+svn${SRCREV}" + +SRC_URI = "svn://garage.maemo.org/svn/lms/;module=python-lightmediascanner;proto=https" +S = "${WORKDIR}/python-lightmediascanner" + +inherit distutils diff --git a/packages/busybox/slingbox-1.2.2/.mtn2git_empty b/packages/rxtx/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/busybox/slingbox-1.2.2/.mtn2git_empty +++ b/packages/rxtx/.mtn2git_empty diff --git a/packages/rxtx/files/.mtn2git_empty b/packages/rxtx/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/rxtx/files/.mtn2git_empty diff --git a/packages/rxtx/files/rxtx-fixes-from-debian.patch b/packages/rxtx/files/rxtx-fixes-from-debian.patch new file mode 100644 index 0000000000..0e35eb7603 --- /dev/null +++ b/packages/rxtx/files/rxtx-fixes-from-debian.patch @@ -0,0 +1,235 @@ +Index: rxtx-2.1-7r2/configure +=================================================================== +--- rxtx-2.1-7r2.orig/configure 2008-02-09 02:08:40.000000000 +0100 ++++ rxtx-2.1-7r2/configure 2008-02-09 02:09:02.000000000 +0100 +@@ -21501,7 +21501,7 @@ + case $JAVA_VENDOR in + Tran*) + find_java_native_include jni.h +- JAVAH="\$(JPATH)/bin/kaffeh -classpath \$(CLASSPATH) -d \$(DEST) -jni" ++ JAVAH="\$(JPATH)/bin/kaffeh -classpath \$(JPATH)/jre/lib/rt.jar:\$(CLASSPATH) -d \$(DEST) -jni" + JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3" + JAR="\$(JPATH)/bin/jar" + JAVADOC="\$(JPATH)/bin/javadoc -classpath \$(CLASSPATH)" +@@ -21513,7 +21513,7 @@ + ;; + *) + find_java_native_include jni_md.h +- JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni" ++ JAVAH="\$(JPATH)/bin/javah -classpath \$(JPATH)/jre/lib/rt.jar:\$(CLASSPATH) -d \$(DEST) -jni" + JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3" + JAR="\$(JPATH)/bin/jar" + JAVADOC="\$(JPATH)/bin/javadoc" +@@ -21541,7 +21541,7 @@ + CFLAGS=$CFLAGS" -D__need_timespec" + case $JAVA_VERSION in + +- 1.2*|1.3*|1.4*|1.5*) ++ 1.2*|1.3*|1.4*|1.5*|1.6*) + #fix_parameters $JPATH/jre/lib/javax.comm.properties + CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` + JHOME=$JPATH"/jre/lib/ext" +@@ -21611,7 +21611,7 @@ + TARGETLIB="\$(target_triplet)/librxtxSerial.la \ + \$(target_triplet)/librxtxParallel.la" + case $JAVA_VERSION in +- 1.2*|1.3*|1.4*|1.5*) ++ 1.2*|1.3*|1.4*|1.5*|1.6*) + #fix_parameters $JPATH/jre/lib/javax.comm.properties + CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` + RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" +@@ -21747,7 +21747,7 @@ + + WIN32) + case $JAVA_VERSION in +- 1.2*|1.3*|1.4*|1.5*) ++ 1.2*|1.3*|1.4*|1.5*|1.6*) + CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH" + JHOME=$JPATH"/jre/lib/ext" + ;; +@@ -21799,7 +21799,7 @@ + CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH" + + case $JAVA_VERSION in +- 1.2*|1.3*|1.4*|1.5*) ++ 1.2*|1.3*|1.4*|1.5*|1.6*) + RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" + ;; + 1.1*) +Index: rxtx-2.1-7r2/src/I2CImp.c +=================================================================== +--- rxtx-2.1-7r2.orig/src/I2CImp.c 2004-10-17 16:23:02.000000000 +0200 ++++ rxtx-2.1-7r2/src/I2CImp.c 2008-02-09 02:09:02.000000000 +0100 +@@ -22,8 +22,8 @@ + #include "config.h" + #include "gnu_io_I2C.h" + #endif /* dima */ +-#include <time.h> + #include <unistd.h> ++#include <time.h> + #include <stdio.h> + #include <string.h> + #include <stdlib.h> +@@ -88,6 +88,7 @@ + #endif /* !__FreeBSD__ */ + #if defined(__linux__) + /* Lets let people who upgraded kernels know they may have problems */ ++ /* + if (uname (&name) == -1) + { + fprintf(stderr,"RXTX WARNING: cannot get system name\n"); +@@ -98,6 +99,7 @@ + fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); + getchar(); + } ++ */ + #endif /* __linux__ */ + #endif /* WIN32 */ + } +Index: rxtx-2.1-7r2/Makefile.in +=================================================================== +--- rxtx-2.1-7r2.orig/Makefile.in 2008-02-09 02:08:40.000000000 +0100 ++++ rxtx-2.1-7r2/Makefile.in 2008-02-09 02:09:02.000000000 +0100 +@@ -556,6 +556,7 @@ + $(CLASSES): $(javafiles) $(TOP)/Makefile + $(JAVAH_FIX) + $(JAVAC) $(javafiles) ++ mkdir $(DEST) + $(JAVAH) `(for i in $(javahfiles);do \ + if grep > /dev/null native.*\( $(SPATH)/$$i.java; then \ + echo $(CLASSDIR).$$i; \ +@@ -572,7 +573,7 @@ + echo $$i; \ + fi; \ + done` $(RXTX_PATH) +- $(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/ ++ $(INSTALL_DATA) $(JARTARGET) $(JHOME)/ + + clean-generic: + rm -rf $(DEST) $(TOP)/$(CLASSTOP) +Index: rxtx-2.1-7r2/src/ParallelImp.c +=================================================================== +--- rxtx-2.1-7r2.orig/src/ParallelImp.c 2005-06-10 21:50:31.000000000 +0200 ++++ rxtx-2.1-7r2/src/ParallelImp.c 2008-02-09 02:09:02.000000000 +0100 +@@ -38,8 +38,8 @@ + /*#include <typedefs_md.h>*/ + #include "gnu_io_LPRPort.h" + #endif /* dima */ +-#include <time.h> + #include <unistd.h> ++#include <time.h> + #include <stdio.h> + #include <string.h> + #ifndef WIN32 +Index: rxtx-2.1-7r2/src/RawImp.c +=================================================================== +--- rxtx-2.1-7r2.orig/src/RawImp.c 2008-02-09 02:08:40.000000000 +0100 ++++ rxtx-2.1-7r2/src/RawImp.c 2008-02-09 02:09:02.000000000 +0100 +@@ -31,8 +31,8 @@ + #include "config.h" + #include "gnu_io_Raw.h" + #endif /* dima */ +-#include <time.h> + #include <unistd.h> ++#include <time.h> + #include <stdio.h> + #include <string.h> + #include <stdlib.h> +@@ -232,6 +232,7 @@ + #endif /* !__FreeBSD__ */ + #if defined(__linux__) + /* Lets let people who upgraded kernels know they may have problems */ ++ /* + if (uname (&name) == -1) + { + fprintf(stderr,"RXTX WARNING: cannot get system name\n"); +@@ -242,6 +243,7 @@ + fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); + getchar(); + } ++ */ + #endif /* __linux__ */ + #endif /* WIN32 */ + } +Index: rxtx-2.1-7r2/src/RS485Imp.c +=================================================================== +--- rxtx-2.1-7r2.orig/src/RS485Imp.c 2004-10-16 18:20:35.000000000 +0200 ++++ rxtx-2.1-7r2/src/RS485Imp.c 2008-02-09 02:09:02.000000000 +0100 +@@ -22,8 +22,8 @@ + #include "config.h" + #include "gnu_io_RS485.h" + #endif /* dima */ +-#include <time.h> + #include <unistd.h> ++#include <time.h> + #include <stdio.h> + #include <string.h> + #include <stdlib.h> +@@ -88,6 +88,7 @@ + #endif /* !__FreeBSD__ */ + #if defined(__linux__) + /* Lets let people who upgraded kernels know they may have problems */ ++ /* + if (uname (&name) == -1) + { + fprintf(stderr,"RXTX WARNING: cannot get system name\n"); +@@ -98,6 +99,7 @@ + fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); + getchar(); + } ++ */ + #endif /* __linux__ */ + #endif /* WIN32 */ + } +Index: rxtx-2.1-7r2/src/SerialImp.c +=================================================================== +--- rxtx-2.1-7r2.orig/src/SerialImp.c 2008-02-09 02:08:40.000000000 +0100 ++++ rxtx-2.1-7r2/src/SerialImp.c 2008-02-09 02:09:02.000000000 +0100 +@@ -27,10 +27,10 @@ + #ifdef __LCC__ /* windows lcc compiler for fd_set. probably wrong */ + # include<winsock.h> + #endif /* __LCC__ */ +-#include <time.h> + #include <stdio.h> + #include <string.h> + #include <stdlib.h> ++#include <time.h> + #include <errno.h> + #include <limits.h> + #include <sys/stat.h> +@@ -281,6 +281,7 @@ + #endif /* DEBUG_TIMING */ + #if defined(DEBUG) && defined(__linux__) + /* Lets let people who upgraded kernels know they may have problems */ ++ /* + if (uname (&name) == -1) + { + report( "RXTX WARNING: cannot get system name\n" ); +@@ -294,6 +295,7 @@ + report( message ); + getchar(); + } ++ */ + LEAVE( "RXTXPort:Initialize" ); + #endif /* DEBUG && __linux__ */ + } +Index: rxtx-2.1-7r2/src/SerialImp.cpp +=================================================================== +--- rxtx-2.1-7r2.orig/src/SerialImp.cpp 2004-10-12 10:59:27.000000000 +0200 ++++ rxtx-2.1-7r2/src/SerialImp.cpp 2008-02-09 02:09:02.000000000 +0100 +@@ -103,6 +103,7 @@ + #endif /* !__FreeBSD__ */ + #ifdef DEBUG + /* Lets let people who upgraded kernels know they may have problems */ ++ /* + if (uname (&name) == -1) + { + report("RXTX WARNING: cannot get system name\n"); +@@ -114,6 +115,7 @@ + name.release); + getchar(); + } ++ */ + #endif /* DEBUG */ + #endif /* __BEOS__ */ + #endif /* WIN32 */ diff --git a/packages/rxtx/rxtx_2.1-7r2.bb b/packages/rxtx/rxtx_2.1-7r2.bb new file mode 100644 index 0000000000..e91a406cfc --- /dev/null +++ b/packages/rxtx/rxtx_2.1-7r2.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "RXTX provides serial and parallel communication for Java applications" +LICENSE = "LGPL" +SECTION = "libs" +MAINTAINER = "Robert Schuster, tarent GmbH Bonn <robert.schuster@tarent.de>" +HOMEPAGE = "http://rxtx.org" + +inherit autotools java-library + +SRC_URI = "\ + http://rxtx.qbang.org/pub/rxtx/${PN}-${PV}.zip \ + file://rxtx-fixes-from-debian.patch;patch=1 \ + " + +do_install() { + install -d ${D}/${libdir_jni} + install -d ${D}/${datadir_java} + + oe_runmake install \ + RXTX_PATH=${D}/${libdir_jni} \ + JHOME=${D}/${datadir_java} +} + +do_stage() { + oe_jarinstall -s RXTXcomm.jar +} + +PACKAGES = "${JPN} lib${PN}-jni lib${PN}-dev lib${PN}-jni-dbg" + +FILES_lib${PN}-jni = "${libdir_jni}/lib*.so" +FILES_lib${PN}-dev = "${libdir_jni}/lib*.la" +FILES_lib${PN}-jni-dbg = "${libdir_jni}/.debug/lib*.so" diff --git a/packages/taglib/files/.mtn2git_empty b/packages/taglib/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/taglib/files/.mtn2git_empty diff --git a/packages/taglib/files/taglib_1.4-8.diff.gz b/packages/taglib/files/taglib_1.4-8.diff.gz Binary files differnew file mode 100644 index 0000000000..f128f4d3de --- /dev/null +++ b/packages/taglib/files/taglib_1.4-8.diff.gz diff --git a/packages/taglib/taglib_1.4.bb b/packages/taglib/taglib_1.4.bb index 43fb2a2bfa..e50eeb6490 100644 --- a/packages/taglib/taglib_1.4.bb +++ b/packages/taglib/taglib_1.4.bb @@ -1,41 +1,24 @@ DESCRIPTION = "TagLib is a library for reading and editing the meta-data of several popular audio formats" -SECTION = "libs" +SECTION = "libs/multimedia" HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html" LICENSE = "LGPL" -PR = "r1" +PR = "r2" -SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz" +SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \ + file://taglib_1.4-8.diff.gz;patch=1" S = "${WORKDIR}/taglib-${PV}" -inherit autotools qmake_base pkgconfig binconfig +inherit autotools pkgconfig binconfig -export OE_QMAKE_LINK="${CXX}" - -do_configure() { - # calling oe_runconf to generate pkgconfig and binconfig files - oe_runconf - cd ${S}/taglib && rm -f Makefile* && qmake -project -o tag.pro -t lib && \ - qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${S} -} - -do_compile() { - oe_runmake -C taglib +do_postpatch() { + rm -rf patches && rm -rf .pc && mv -f debian/patches patches && quilt push -av } +addtask postpatch after do_patch before do_configure -do_stage_append() { - install -d ${STAGING_INCDIR}/taglib - for i in `find taglib -name "*.h"` - do - install $i ${STAGING_INCDIR}/taglib/ - done - for i in `find taglib -name "*.tcc"` - do - install $i ${STAGING_INCDIR}/taglib/ - done - oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR} +do_stage() { + autotools_stage_all } -do_install() { - install -d ${D}${libdir} - oe_libinstall -so -C taglib libtag ${D}${libdir} -} +PACKAGES =+ "${PN}-c" +FILES_${PN}-dbg += "${bindir}/taglib-config" +FILES_${PN}-c = "${libdir}/libtag_c.so.*" diff --git a/packages/taglib/taglibc_1.4.bb b/packages/taglib/taglibc_1.4.bb deleted file mode 100644 index 1a3a702bb9..0000000000 --- a/packages/taglib/taglibc_1.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "TagLib is a library for reading and editing the meta-data \ -of several popular audio formats. Currently it supports both ID3v1 and ID3v2 \ -for MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC files" -SECTION = "libs" -HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html" -DEPENDS = "taglib" -LICENSE = "LGPL" - -SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz" -S = "${WORKDIR}/taglib-${PV}" - -inherit autotools qmake_base pkgconfig binconfig - -do_configure() { - echo running oe_runconf to get pkgconfig and binconfig files created - oe_runconf - cd ${S}/bindings/c && rm -f Makefile* && qmake -project -o tag_c.pro -t lib && \ - qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${STAGING_INCDIR}/taglib LIBS+=-ltag -} - -do_compile() { - oe_runmake -C bindings/c -} - -do_stage_append() { - install -d ${STAGING_INCDIR}/taglib - install -m 0644 bindings/c/tag_c.h ${STAGING_INCDIR} - oe_libinstall -so -C bindings/c libtag_c ${STAGING_LIBDIR} -} - -do_install() { - oe_libinstall -so -C bindings/c libtag_c ${D}${libdir} -} diff --git a/packages/tasks/task-openmoko-python-devel.bb b/packages/tasks/task-openmoko-python-devel.bb index 37d64847f6..695c380bc6 100644 --- a/packages/tasks/task-openmoko-python-devel.bb +++ b/packages/tasks/task-openmoko-python-devel.bb @@ -1,11 +1,12 @@ DESCRIPTION = "OpenMoko: Python Development Tools" SECTION = "openmoko/devel" LICENSE = "MIT" -PR = "r1" +PR = "r2" inherit task RDEPENDS_task-openmoko-python-devel = "\ python-efl \ python-pygtk \ + python-lightmediascanner \ " diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index 61daa7e089..a23589111d 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,7 +1,7 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml24" +PR = "ml25" RDEPENDS = "\ python-ao \ @@ -30,6 +30,7 @@ RDEPENDS = "\ python-itools \ python-logilab-common \ python-libgmail \ + python-lightmediascanner \ python-lxml \ python-mad \ python-numarray \ diff --git a/packages/xorg-app/beforelight_1.0.3.bb b/packages/xorg-app/beforelight_1.0.3.bb new file mode 100644 index 0000000000..c4833b03fd --- /dev/null +++ b/packages/xorg-app/beforelight_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "a sample implementation of a screen saver for X" +DEPENDS += " virtual/libx11 libxscrnsaver libxt libxaw libxt" +PE = "1" diff --git a/packages/xorg-app/xfs_1.0.5.bb b/packages/xorg-app/xfs_1.0.5.bb new file mode 100644 index 0000000000..8cef4bda9a --- /dev/null +++ b/packages/xorg-app/xfs_1.0.5.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "X fontserver" +DEPENDS += " libfs libxfont xtrans" +PE = "1" diff --git a/packages/xorg-app/xgamma_1.0.2.bb b/packages/xorg-app/xgamma_1.0.2.bb new file mode 100644 index 0000000000..e5d479aa81 --- /dev/null +++ b/packages/xorg-app/xgamma_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "Alter a monitor's gamma correction through the X server" +DEPENDS += " virtual/libx11 libxxf86vm" +PE = "1" diff --git a/packages/xorg-app/xpr_1.0.2.bb b/packages/xorg-app/xpr_1.0.2.bb new file mode 100644 index 0000000000..96b340c8c7 --- /dev/null +++ b/packages/xorg-app/xpr_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "print an X window dump" +DEPENDS += " libxmu virtual/libx11" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-acecad_1.2.1.bb b/packages/xorg-driver/xf86-input-acecad_1.2.1.bb new file mode 100644 index 0000000000..c993bc7718 --- /dev/null +++ b/packages/xorg-driver/xf86-input-acecad_1.2.1.bb @@ -0,0 +1,5 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- AceCad input driver" +PE = "1" + diff --git a/packages/xorg-driver/xf86-input-calcomp_1.1.1.bb b/packages/xorg-driver/xf86-input-calcomp_1.1.1.bb new file mode 100644 index 0000000000..a309230801 --- /dev/null +++ b/packages/xorg-driver/xf86-input-calcomp_1.1.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- Calcomp input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-citron_2.2.1.bb b/packages/xorg-driver/xf86-input-citron_2.2.1.bb new file mode 100644 index 0000000000..4c449b12d7 --- /dev/null +++ b/packages/xorg-driver/xf86-input-citron_2.2.1.bb @@ -0,0 +1,5 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X Server -- Citron input driver" +PE = "1" + diff --git a/packages/xorg-driver/xf86-input-dmc_1.1.1.bb b/packages/xorg-driver/xf86-input-dmc_1.1.1.bb new file mode 100644 index 0000000000..fea3ce83aa --- /dev/null +++ b/packages/xorg-driver/xf86-input-dmc_1.1.1.bb @@ -0,0 +1,5 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- DMC input driver" +PE = "1" + diff --git a/packages/xorg-driver/xf86-input-dynapro_1.1.1.bb b/packages/xorg-driver/xf86-input-dynapro_1.1.1.bb new file mode 100644 index 0000000000..0033ffe7fa --- /dev/null +++ b/packages/xorg-driver/xf86-input-dynapro_1.1.1.bb @@ -0,0 +1,5 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- Dynapro input driver" +PE = "1" + diff --git a/packages/xorg-driver/xf86-input-elo2300_1.1.1.bb b/packages/xorg-driver/xf86-input-elo2300_1.1.1.bb new file mode 100644 index 0000000000..7841287fb0 --- /dev/null +++ b/packages/xorg-driver/xf86-input-elo2300_1.1.1.bb @@ -0,0 +1,5 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- ELO2300 input driver" +PE = "1" + diff --git a/packages/xorg-driver/xf86-input-elographics_1.1.0.bb b/packages/xorg-driver/xf86-input-elographics_1.1.0.bb new file mode 100644 index 0000000000..cb49a58d4c --- /dev/null +++ b/packages/xorg-driver/xf86-input-elographics_1.1.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- ELOGraphics input driver" +PE = "2" diff --git a/packages/xorg-driver/xf86-input-evdev_1.2.0.bb b/packages/xorg-driver/xf86-input-evdev_1.2.0.bb new file mode 100644 index 0000000000..792909621a --- /dev/null +++ b/packages/xorg-driver/xf86-input-evdev_1.2.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- evdev input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-joystick_1.3.1.bb b/packages/xorg-driver/xf86-input-joystick_1.3.1.bb new file mode 100644 index 0000000000..a53297fd8a --- /dev/null +++ b/packages/xorg-driver/xf86-input-joystick_1.3.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- joystick input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-magellan_1.1.1.bb b/packages/xorg-driver/xf86-input-magellan_1.1.1.bb new file mode 100644 index 0000000000..2bbf253d53 --- /dev/null +++ b/packages/xorg-driver/xf86-input-magellan_1.1.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- Magellan input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-microtouch_1.1.1.bb b/packages/xorg-driver/xf86-input-microtouch_1.1.1.bb new file mode 100644 index 0000000000..9a90a80b9f --- /dev/null +++ b/packages/xorg-driver/xf86-input-microtouch_1.1.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- MicroTouch input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-mouse_1.2.3.bb b/packages/xorg-driver/xf86-input-mouse_1.2.3.bb new file mode 100644 index 0000000000..e6325675f8 --- /dev/null +++ b/packages/xorg-driver/xf86-input-mouse_1.2.3.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- mouse input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-penmount_1.2.1.bb b/packages/xorg-driver/xf86-input-penmount_1.2.1.bb new file mode 100644 index 0000000000..1ed62d4cad --- /dev/null +++ b/packages/xorg-driver/xf86-input-penmount_1.2.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- Penmount input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-spaceorb_1.1.1.bb b/packages/xorg-driver/xf86-input-spaceorb_1.1.1.bb new file mode 100644 index 0000000000..cf099b8193 --- /dev/null +++ b/packages/xorg-driver/xf86-input-spaceorb_1.1.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- SpaceOrb input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-vmmouse_12.4.3.bb b/packages/xorg-driver/xf86-input-vmmouse_12.4.3.bb new file mode 100644 index 0000000000..7af9f7ddc9 --- /dev/null +++ b/packages/xorg-driver/xf86-input-vmmouse_12.4.3.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-void_1.1.1.bb b/packages/xorg-driver/xf86-input-void_1.1.1.bb new file mode 100644 index 0000000000..2fa7021d95 --- /dev/null +++ b/packages/xorg-driver/xf86-input-void_1.1.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- void input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-ati_6.7.197.bb b/packages/xorg-driver/xf86-video-ati_6.7.197.bb new file mode 100644 index 0000000000..4aae05a747 --- /dev/null +++ b/packages/xorg-driver/xf86-video-ati_6.7.197.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- ATI display driver" +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-i128_1.2.1.bb b/packages/xorg-driver/xf86-video-i128_1.2.1.bb new file mode 100644 index 0000000000..78d5eda810 --- /dev/null +++ b/packages/xorg-driver/xf86-video-i128_1.2.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- i128 display driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-i810_1.7.4.bb b/packages/xorg-driver/xf86-video-i810_1.7.4.bb new file mode 100644 index 0000000000..eed1fcb600 --- /dev/null +++ b/packages/xorg-driver/xf86-video-i810_1.7.4.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-mga_1.9.99.bb b/packages/xorg-driver/xf86-video-mga_1.9.99.bb new file mode 100644 index 0000000000..0ed0d28dfd --- /dev/null +++ b/packages/xorg-driver/xf86-video-mga_1.9.99.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- MGA display driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-nsc_2.8.3.bb b/packages/xorg-driver/xf86-video-nsc_2.8.3.bb new file mode 100644 index 0000000000..96486d2e72 --- /dev/null +++ b/packages/xorg-driver/xf86-video-nsc_2.8.3.bb @@ -0,0 +1,9 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- NSC display driver" +DEPENDS += " xf86dgaproto" +PE = "1" + +# This driver is broken because it's seldom updated. It compiles +# but fails to communicate with the card without this deprecated define. +EXTRA_OEMAKE += "CFLAGS+=-DXFree86Server" diff --git a/packages/xorg-driver/xf86-video-nv_2.1.7.bb b/packages/xorg-driver/xf86-video-nv_2.1.7.bb new file mode 100644 index 0000000000..0d4ee2ed19 --- /dev/null +++ b/packages/xorg-driver/xf86-video-nv_2.1.7.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- NV display driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-sis_0.9.4.bb b/packages/xorg-driver/xf86-video-sis_0.9.4.bb new file mode 100644 index 0000000000..dd6e106e0d --- /dev/null +++ b/packages/xorg-driver/xf86-video-sis_0.9.4.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- SiS display driver" +DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto" +PE = "1" diff --git a/packages/xorg-lib/libxmu_1.0.4.bb b/packages/xorg-lib/libxmu_1.0.4.bb new file mode 100644 index 0000000000..396e2a2d4b --- /dev/null +++ b/packages/xorg-lib/libxmu_1.0.4.bb @@ -0,0 +1,15 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 miscellaneous utility library" +DEPENDS += "libxt libxext" +PROVIDES = "xmu" +PE = "1" + +XORG_PN = "libXmu" + +LEAD_SONAME = "libXmu" + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" diff --git a/packages/xorg-proto/xproto-native_7.0.11.bb b/packages/xorg-proto/xproto-native_7.0.11.bb new file mode 100644 index 0000000000..baae28ec32 --- /dev/null +++ b/packages/xorg-proto/xproto-native_7.0.11.bb @@ -0,0 +1,5 @@ +require xproto_${PV}.bb + +XORG_PN = "xproto" + +inherit native |