diff options
102 files changed, 2058 insertions, 652 deletions
diff --git a/classes/nslu2-mirrors.bbclass b/classes/nslu2-mirrors.bbclass new file mode 100644 index 0000000000..1181edc716 --- /dev/null +++ b/classes/nslu2-mirrors.bbclass @@ -0,0 +1,4 @@ +MIRRORS_append () { +ftp://.*/.*/ http://sources.nslu2-linux.org/sources/ +http://.*/.*/ http://sources.nslu2-linux.org/sources/ +} diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 5de9b8755a..5b55589ec0 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -1,6 +1,26 @@ -def tinder_tinder_time(): - import time - return time.strftime('%m/%d/%Y %H:%M:%S', time.localtime()) +def tinder_tz_offset(off): + # get the offset. Either it is a number like + # +200 or -300 + try: + return int(off) + except ValueError: + if off == "Europe/Berlin": + return 200 + else: + return 0 + +def tinder_tinder_time(offset): + import datetime + td = datetime.timedelta(tinder_tz_offset(offset)) + time = datetime.datetime.utcnow() + td + return time.strftime('%m/%d/%Y %H:%M:%S') + +def tinder_tinder_start(date,offset): + import datetime, time + td = datetime.timedelta(tinder_tz_offset(offset)) + ti = time.strptime(date, "%m/%d/%Y %H:%M:%S") + ti = datetime.datetime(*ti[0:7])-td + return time.strftime('%m/%d/%Y %H:%M:%S') def tinder_send_email(da, header, log): import smtplib @@ -21,8 +41,8 @@ def tinder_send_http(da, header, log): from bb import data import httplib, urllib cont = "\n%s\n%s" % ( header, log) - headers = {"Content-type": "multipart/form-data" } - + headers = {"Content-type": "multipart/form-data" } + conn = httplib.HTTPConnection(data.getVar('TINDER_HOST',da, True)) conn.request("POST", data.getVar('TINDER_URL',da,True), cont, headers) conn.close() @@ -33,11 +53,11 @@ def tinder_prepare_mail_header(da, status): from bb import data str = "tinderbox: administrator: %s\n" % data.getVar('TINDER_ADMIN', da, True) - str += "tinderbox: starttime: %s\n" % data.getVar('BUILDSTART', da, True) or data.getVar('TINDER_START', da, True) + str += "tinderbox: starttime: %s\n" % tinder_tinder_start(data.getVar('TINDER_START', da, True) or data.getVar('BUILDSTART', da, True), data.getVar('TINDER_TZ', da, True)) str += "tinderbox: buildname: %s\n" % data.getVar('TINDER_BUILD', da, True) str += "tinderbox: errorparser: %s\n" % data.getVar('TINDER_ERROR', da, True) str += "tinderbox: status: %s\n" % status - str += "tinderbox: timenow: %s\n" % tinder_tinder_time() + str += "tinderbox: timenow: %s\n" % tinder_tinder_time(data.getVar('TINDER_TZ', da, True)) str += "tinderbox: tree: %s\n" % data.getVar('TINDER_TREE', da, True) str += "tinderbox: buildfamily: %s\n" % "unix" str += "tinderbox: END" @@ -76,8 +96,8 @@ def tinder_do_tinder_report(event): if name == "PkgFailed" or name == "BuildCompleted": status = 'build_failed' - if name == "BuildCompleted": - status = "success" + if name == "BuildCompleted": + status = "success" header = tinder_prepare_mail_header(event.data, status) # append the log log_file = data.getVar('TINDER_LOG', event.data, True) @@ -120,7 +140,7 @@ def tinder_do_tinder_report(event): log_post_method = tinder_send_email if data.getVar('TINDER_SENDLOG', event.data, True) == "http": - log_post_method = tinder_send_http + log_post_method = tinder_send_http log_post_method(event.data, header, log) diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index e4da231aa5..50b4daf26d 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -20,6 +20,8 @@ ${PKGDIR}/packages/coreutils/*.bb \ ${PKGDIR}/packages/cpio/*.bb \ ${PKGDIR}/packages/cron/*.bb \ ${PKGDIR}/packages/cvs/*.bb \ +${PKGDIR}/packages/cyrus-imapd/*.bb \ +${PKGDIR}/packages/cyrus-sasl/*.bb \ ${PKGDIR}/packages/db/*.bb \ ${PKGDIR}/packages/devio/*.bb \ ${PKGDIR}/packages/diffutils/*.bb \ @@ -43,7 +45,6 @@ ${PKGDIR}/packages/glibc/*.bb \ ${PKGDIR}/packages/gnu-config/*.bb \ ${PKGDIR}/packages/gphoto2/*.bb \ ${PKGDIR}/packages/grep/*.bb \ -${PKGDIR}/packages/groff/*.bb \ ${PKGDIR}/packages/gtk-doc/*.bb \ ${PKGDIR}/packages/gzip/*.bb \ ${PKGDIR}/packages/hotplug-ng/*.bb \ @@ -92,6 +93,7 @@ ${PKGDIR}/packages/musicpd/*.bb \ ${PKGDIR}/packages/mutt/*.bb \ ${PKGDIR}/packages/mysql/*.bb \ ${PKGDIR}/packages/nail/*.bb \ +${PKGDIR}/packages/nano/*.bb \ ${PKGDIR}/packages/ncftp/*.bb \ ${PKGDIR}/packages/ncurses/*.bb \ ${PKGDIR}/packages/netbase/*.bb \ @@ -137,12 +139,14 @@ ${PKGDIR}/packages/screen/*.bb \ ${PKGDIR}/packages/sed/*.bb \ ${PKGDIR}/packages/setpwc/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ +${PKGDIR}/packages/strace/*.bb \ ${PKGDIR}/packages/streamripper/*.bb \ ${PKGDIR}/packages/sudo/*.bb \ ${PKGDIR}/packages/sysfsutils/*.bb \ ${PKGDIR}/packages/sysvinit/*.bb \ ${PKGDIR}/packages/tar/*.bb \ ${PKGDIR}/packages/thttpd/*.bb \ +${PKGDIR}/packages/timezones/*.bb \ ${PKGDIR}/packages/tinylogin/*.bb \ ${PKGDIR}/packages/unionfs/*.bb \ ${PKGDIR}/packages/unzip/*.bb \ @@ -154,4 +158,4 @@ ${PKGDIR}/packages/vlan/*.bb \ ${PKGDIR}/packages/wget/*.bb \ ${PKGDIR}/packages/xinetd/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ -" +${OPENSLUG_EXTRA_BBFILES}" diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index dd4d7c0b5b..80cf489b5b 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -2,13 +2,36 @@ #@NAME: OpenSlug #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2 +#---------------------------------------------------------------------------------- +# STANDARD OpenSlug DEFINITIONS +#---------------------------------------------------------------------------------- DISTRO_NAME = "OpenSlug" DISTRO_VERSION = "2.4-beta" DISTRO_TYPE ?= "beta" -# pull in the frozen list of bbfiles +TARGET_FPU = "soft" +TARGET_OS = "linux" + +USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" + +INHERIT += " package_ipk debian nslu2_flashimg" + +# NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to +# the .bb files for the packages to build - see openslug-packages.conf in this +# directory +OPENSLUG_EXTRA_BBFILES ?= "" + +# pull in the frozen list of bbfiles - this sets BBFILES and this will override any +# setting in local.conf include conf/distro/freeze.conf +#---------------------------------------------------------------------------------- +# FEEDS +# The following lines define where on the internet OpenSlug looks for packages +# when downloading new packages or updating existing packages. Additional feeds +# (such as a local feed) can be defined in local.conf +#---------------------------------------------------------------------------------- # Add to the user's feeds from local.conf (there may be none) FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}" FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}" @@ -18,30 +41,24 @@ FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/na #FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable" #FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable" - -TARGET_FPU_local ?= "soft" -TARGET_FPU := "${TARGET_FPU_local}" -TARGET_OS_local ?= "linux" -TARGET_OS := "${TARGET_OS_local}" - -USE_NLS ?= "no" -USE_NLS_glib-2.0 = "yes" - -INHERIT += " package_ipk debian nslu2_flashimg" - +#---------------------------------------------------------------------------------- +# FIRMWARE CONFIGURATION +#---------------------------------------------------------------------------------- +# IMAGE BUILD OPTIONS +# ------------------- IMAGE_FSTYPES = "jffs2" OPENSLUG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-openslug.txt')}" EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DEVICE_TABLE}" -OPENSLUG_EXTRA_DEPENDS ?= "e2fsprogs reiserfsprogs upslug-native lrzsz" - # CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided # to enable/disable debugging in the distro. Here noirqdebug is used to # remove the messages about unhandled interrupts - people debugging interrupt # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) CMDLINE_DEBUG = "noirqdebug" +# EXTRA PACKAGES +# -------------- # Filesystem support modules are listed in here for easy removal, # as is the lrzsz serial package and other kernel modules which are # not absolutely required for boot. @@ -49,13 +66,47 @@ CMDLINE_DEBUG = "noirqdebug" # the ext2/ext3 support is optional! OPENSLUG_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck" OPENSLUG_REISER_PROGS = "reiserfsprogs" -OPENSLUG_EXTRA_RDEPENDS ?= "\ -lrzsz \ -${OPENSLUG_EXT2_PROGS} ${OPENSLUG_REISER_PROGS} \ -kernel-module-usbnet \ -kernel-module-pegasus kernel-module-p8022 kernel-module-kaweth \ -kernel-module-usbserial \ -kernel-module-pl2303 kernel-module-ftdi-sio" + +# The standard firmware contents and additional packages built as requirements +# of the firmware are defined here in OPENSLUG_STANDARD_RDEPENDS and +# OPENSLUG_STANDARD_DEPENDS respectively. +OPENSLUG_STANDARD_DEPENDS = "" +OPENSLUG_STANDARD_RDEPENDS = "" + +# Support for a variety of file systems is built in to the openslug +# image, programs to format disks with these file systems may be +# added or removed. By default ext2. ext3 and reiserfs supported +# is included by the following lines. +# +# These lines add support for formatting ext2 and ext3 file systems +# on a hard disk attached to the NSLU2. ext3 is the standard Linux +# file system. +OPENSLUG_STANDARD_DEPENDS += "e2fsprogs" +OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_EXT2_PROGS}" + +# These lines add support for formatting reiserfs file systems on +# a hard disk. +OPENSLUG_STANDARD_DEPENDS += "reiserfsprogs" +OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_REISER_PROGS}" + +# These lines add a build of the 'upslug' program which may be +# used to download the final image to an NSLU2. The program can +# be found within the tmp/work/upslug-native* directory. +OPENSLUG_STANDARD_DEPENDS += "upslug-native" + +# These lines add support for an X/Y/ZModem package called lrzsz +# (this is of use for people with modified NSLU2 hardware which +# supports a serial port.) +OPENSLUG_STANDARD_DEPENDS += "lrzsz" +OPENSLUG_STANDARD_RDEPENDS += "lrzsz" + +# The 'standard' values are the defaults for the 'extra' packages added +# to the firmware image. None of these things are requirements to have +# a bootable, useable, system however they *are* expected to be present +# in OpenSlug - see osuclibc for a more minimal configuration and some +# more instructions about how to make a non-openslug image. +OPENSLUG_EXTRA_DEPENDS ?= "${OPENSLUG_STANDARD_DEPENDS}" +OPENSLUG_EXTRA_RDEPENDS ?= "${OPENSLUG_STANDARD_RDEPENDS}" # Filesystem selection: set in local.conf to override. Adding entries # here adds the module to the image. The module must be built as part @@ -68,6 +119,8 @@ kernel-module-pl2303 kernel-module-ftdi-sio" # for more information on the language behaviour of the DOS file # systems. # +# KERNEL LEVEL FILE SYSTEM SUPPORT +# -------------------------------- # NOTE: removing kernel-module-nfs from this list will prevent NFS # boot (however you can do a simple flash file system boot - no # attached disk - and install the nfs modules from ssh.) @@ -94,6 +147,9 @@ kernel-module-nls-utf8 \ OPENSLUG_EXTRA_INSTALL ?= "${OPENSLUG_EXTRA_RDEPENDS} ${OPENSLUG_EXTRA_FILESYSTEMS}" +#---------------------------------------------------------------------------------- +# PACKAGE VERSION CONTROL +#---------------------------------------------------------------------------------- # Select the correct versions of the compiler tools (note that there # is also some selection in machine/nslu2.conf) PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" @@ -103,9 +159,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Select the correct versions of the kernel and modules PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" - -# Tracking the latest version, so the following is commented out. -# Uncomment it before release! PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2" PREFERRED_VERSION_ixp4xx-csr ?= "1.4" diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf new file mode 100644 index 0000000000..b76d352b8a --- /dev/null +++ b/conf/distro/ucslugc-packages.conf @@ -0,0 +1,142 @@ +# automatically generated by bitbake freeze +# hacked by the addition of UCSLUG_EXTRA_BBFILES at the end +BBFILES := "\ +${PKGDIR}/packages/atftp/*.bb \ +${PKGDIR}/packages/autoconf/*.bb \ +${PKGDIR}/packages/automake/*.bb \ +${PKGDIR}/packages/base-files/*.bb \ +${PKGDIR}/packages/base-passwd/*.bb \ +${PKGDIR}/packages/bash/*.bb \ +${PKGDIR}/packages/binutils/*.bb \ +${PKGDIR}/packages/bison/*.bb \ +${PKGDIR}/packages/bluez-libs/*.bb \ +${PKGDIR}/packages/bluez-utils/*.bb \ +${PKGDIR}/packages/boost/*.bb \ +${PKGDIR}/packages/bridge-utils/*.bb \ +${PKGDIR}/packages/busybox/*.bb \ +${PKGDIR}/packages/bzip2/*.bb \ +${PKGDIR}/packages/coreutils/*.bb \ +${PKGDIR}/packages/cpio/*.bb \ +${PKGDIR}/packages/cron/*.bb \ +${PKGDIR}/packages/cvs/*.bb \ +${PKGDIR}/packages/cyrus-imapd/*.bb \ +${PKGDIR}/packages/cyrus-sasl/*.bb \ +${PKGDIR}/packages/db/*.bb \ +${PKGDIR}/packages/devio/*.bb \ +${PKGDIR}/packages/diffutils/*.bb \ +${PKGDIR}/packages/dnsmasq/*.bb \ +${PKGDIR}/packages/dropbear/*.bb \ +${PKGDIR}/packages/expat/*.bb \ +${PKGDIR}/packages/fakeroot/*.bb \ +${PKGDIR}/packages/findutils/*.bb \ +${PKGDIR}/packages/flex/*.bb \ +${PKGDIR}/packages/freeze/*.bb \ +${PKGDIR}/packages/ftpd-topfield/*.bb \ +${PKGDIR}/packages/gawk/*.bb \ +${PKGDIR}/packages/gcc/*.bb \ +${PKGDIR}/packages/gdb/*.bb \ +${PKGDIR}/packages/gdbm/*.bb \ +${PKGDIR}/packages/gettext/*.bb \ +${PKGDIR}/packages/glib-2.0/*.bb \ +${PKGDIR}/packages/gnu-config/*.bb \ +${PKGDIR}/packages/gphoto2/*.bb \ +${PKGDIR}/packages/grep/*.bb \ +${PKGDIR}/packages/gtk-doc/*.bb \ +${PKGDIR}/packages/gzip/*.bb \ +${PKGDIR}/packages/hotplug-ng/*.bb \ +${PKGDIR}/packages/initscripts/*.bb \ +${PKGDIR}/packages/install/*.bb \ +${PKGDIR}/packages/ipkg-utils/*.bb \ +${PKGDIR}/packages/ipkg/*.bb \ +${PKGDIR}/packages/ircp/*.bb \ +${PKGDIR}/packages/ixp425-eth/*.bb \ +${PKGDIR}/packages/ixp4xx/*.bb \ +${PKGDIR}/packages/jpeg/*.bb \ +${PKGDIR}/packages/less/*.bb \ +${PKGDIR}/packages/libaal/*.bb \ +${PKGDIR}/packages/libexif/*.bb \ +${PKGDIR}/packages/libgphoto2/*.bb \ +${PKGDIR}/packages/libiconv/*.bb \ +${PKGDIR}/packages/libid3tag/*.bb \ +${PKGDIR}/packages/libogg/*.bb \ +${PKGDIR}/packages/libpcap/*.bb \ +${PKGDIR}/packages/libtool/*.bb \ +${PKGDIR}/packages/libusb/*.bb \ +${PKGDIR}/packages/libvorbis/*.bb \ +${PKGDIR}/packages/libxml/*.bb \ +${PKGDIR}/packages/linux-libc-headers/*.bb \ +${PKGDIR}/packages/linux/*.bb \ +${PKGDIR}/packages/lsof/*.bb \ +${PKGDIR}/packages/lzo/*.bb \ +${PKGDIR}/packages/m4/*.bb \ +${PKGDIR}/packages/make/*.bb \ +${PKGDIR}/packages/makedevs/*.bb \ +${PKGDIR}/packages/man-pages/*.bb \ +${PKGDIR}/packages/man/*.bb \ +${PKGDIR}/packages/meta/*.bb \ +${PKGDIR}/packages/miau/*.bb \ +${PKGDIR}/packages/microcom/*.bb \ +${PKGDIR}/packages/module-init-tools/*.bb \ +${PKGDIR}/packages/modutils/*.bb \ +${PKGDIR}/packages/monotone/*.bb \ +${PKGDIR}/packages/mt-daapd/*.bb \ +${PKGDIR}/packages/mtd/*.bb \ +${PKGDIR}/packages/mutt/*.bb \ +${PKGDIR}/packages/mysql/*.bb \ +${PKGDIR}/packages/nail/*.bb \ +${PKGDIR}/packages/nano/*.bb \ +${PKGDIR}/packages/ncftp/*.bb \ +${PKGDIR}/packages/ncurses/*.bb \ +${PKGDIR}/packages/netbase/*.bb \ +${PKGDIR}/packages/nslu2-binary-only/*.bb \ +${PKGDIR}/packages/ntp/*.bb \ +${PKGDIR}/packages/obexftp/*.bb \ +${PKGDIR}/packages/openldap/*.bb \ +${PKGDIR}/packages/openntpd/*.bb \ +${PKGDIR}/packages/openobex-apps/*.bb \ +${PKGDIR}/packages/openobex/*.bb \ +${PKGDIR}/packages/openslug-init/*.bb \ +${PKGDIR}/packages/openssh/*.bb \ +${PKGDIR}/packages/openssl/*.bb \ +${PKGDIR}/packages/openvpn/*.bb \ +${PKGDIR}/packages/patch/*.bb \ +${PKGDIR}/packages/patcher/*.bb \ +${PKGDIR}/packages/pciutils/*.bb \ +${PKGDIR}/packages/pcmcia-cs/*.bb \ +${PKGDIR}/packages/pcre/*.bb \ +${PKGDIR}/packages/pkgconfig/*.bb \ +${PKGDIR}/packages/popt/*.bb \ +${PKGDIR}/packages/portmap/*.bb \ +${PKGDIR}/packages/ppp/*.bb \ +${PKGDIR}/packages/procps/*.bb \ +${PKGDIR}/packages/psmisc/*.bb \ +${PKGDIR}/packages/puppy/*.bb \ +${PKGDIR}/packages/pwc/*.bb \ +${PKGDIR}/packages/python/*.bb \ +${PKGDIR}/packages/quilt/*.bb \ +${PKGDIR}/packages/readline/*.bb \ +${PKGDIR}/packages/reiser4progs/*.bb \ +${PKGDIR}/packages/reiserfsprogs/*.bb \ +${PKGDIR}/packages/rsync/*.bb \ +${PKGDIR}/packages/samba/*.bb \ +${PKGDIR}/packages/sane-backends/*.bb \ +${PKGDIR}/packages/screen/*.bb \ +${PKGDIR}/packages/sed/*.bb \ +${PKGDIR}/packages/setpwc/*.bb \ +${PKGDIR}/packages/slugimage/*.bb \ +${PKGDIR}/packages/strace/*.bb \ +${PKGDIR}/packages/sudo/*.bb \ +${PKGDIR}/packages/sysfsutils/*.bb \ +${PKGDIR}/packages/sysvinit/*.bb \ +${PKGDIR}/packages/thttpd/*.bb \ +${PKGDIR}/packages/tinylogin/*.bb \ +${PKGDIR}/packages/uclibc/*.bb \ +${PKGDIR}/packages/unionfs/*.bb \ +${PKGDIR}/packages/unzip/*.bb \ +${PKGDIR}/packages/update-modules/*.bb \ +${PKGDIR}/packages/update-rc.d/*.bb \ +${PKGDIR}/packages/util-linux/*.bb \ +${PKGDIR}/packages/vlan/*.bb \ +${PKGDIR}/packages/wget/*.bb \ +${PKGDIR}/packages/zlib/*.bb \ +${OPENSLUG_UCSLUGC_BBFILES}" diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf new file mode 100644 index 0000000000..af812922be --- /dev/null +++ b/conf/distro/ucslugc.conf @@ -0,0 +1,95 @@ +#@TYPE: Distribution +#@NAME: UcSlugC +#@DESCRIPTION: UcSlugC Linux Distribution for the NSLU2 + +#---------------------------------------------------------------------------------- +# STANDARD UcSlugC DEFINITIONS +#---------------------------------------------------------------------------------- +DISTRO_NAME = "UcSlugC" +DISTRO_VERSION = "1-beta" +DISTRO_TYPE ?= "beta" + +TARGET_FPU = "soft" +TARGET_OS = "linux-uclibc" + +USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" + +INHERIT += " package_ipk debian nslu2_flashimg" + +# The OVERRIDES are modified here so that 'openslug' overrides are picked up if +# present (ucslugc overrides take precedence) +OVERRIDES = "local:${MACHINE}:${DISTRO}:openslug:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}" + +# NOTE: to build new packages set UCSLUGC_EXTRA_BBFILES to the full path name to +# the .bb files for the packages to build - see ucslugc-packages.conf in this +# directory +OPENSLUG_UCSLUGC_BBFILES ?= "" + +# pull in the frozen list of bbfiles - this sets BBFILES and this will override any +# setting in local.conf +include conf/distro/freeze.conf + +#---------------------------------------------------------------------------------- +# FEEDS +# The following lines define where on the internet UcSlugC looks for packages +# when downloading new packages or updating existing packages. Additional feeds +# (such as a local feed) can be defined in local.conf +#---------------------------------------------------------------------------------- +# Add to the user's feeds from local.conf (there may be none) +FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_VERSION}" +FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_VERSION}" + +# +# Uncomment the following to get the unstable feeds +#FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/unstable" +#FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/unstable" + +#---------------------------------------------------------------------------------- +# FIRMWARE CONFIGURATION +#---------------------------------------------------------------------------------- +# IMAGE BUILD OPTIONS +# ------------------- +IMAGE_FSTYPES = "jffs2" + +OPENSLUG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-openslug.txt')}" +EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DEVICE_TABLE}" + +# CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided +# to enable/disable debugging in the distro. Here noirqdebug is used to +# remove the messages about unhandled interrupts - people debugging interrupt +# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) +CMDLINE_DEBUG = "noirqdebug" + +# EXTRA PACKAGES +# -------------- +# UcSlugC builds an openslug-image with no extra packages - to add packages to the +# firmware copy this file (to make a new 'distro' configuration file) and change +# the definition below to include the requirements. +# NOTE: as built this system will *not* be able to boot off anything other than +# the flash file system ('turnup' will not work). You need to add the filesystem +# modules for your chosen root file system (and any others which will be used). +# See openslug.conf for a more full-featured system! +UCLIBC_EXTRA_RDEPENDS ?= "" +UCLIBC_EXTRA_DEPENDS ?= "" +#UCLIBC_EXTRA_BBFILES above may also need to be set + +OPENSLUG_EXTRA_INSTALL = "${UCLIBC_EXTRA_RDEPENDS}" +OPENSLUG_EXTRA_DEPENDS = "${UCLIBC_EXTRA_DEPENDS}" + +#---------------------------------------------------------------------------------- +# PACKAGE VERSION CONTROL +#---------------------------------------------------------------------------------- +# Select the correct versions of the compiler tools (note that there +# is also some selection in machine/nslu2.conf) +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +# Select the correct versions of the kernel and modules +PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" +PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2" + +PREFERRED_VERSION_ixp4xx-csr ?= "1.4" +PREFERRED_VERSION_ixp425-eth ?= "1.1" diff --git a/conf/distro/unslung-packages.conf b/conf/distro/unslung-packages.conf index 8e556db009..1f41b1e846 100644 --- a/conf/distro/unslung-packages.conf +++ b/conf/distro/unslung-packages.conf @@ -34,4 +34,4 @@ ${PKGDIR}/packages/unzip/*.bb \ ${PKGDIR}/packages/update-modules/*.bb \ ${PKGDIR}/packages/wget/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ -" +${UNSLUNG_EXTRA_BBFILES}" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index e250b64c41..75c251f220 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -11,6 +11,7 @@ DISTRO_VERSION = "5.5-beta" DISTRO_TYPE = "beta" # pull in the frozen list of bbfiles +UNSLUNG_EXTRA_BBFILES ?= "" include conf/distro/freeze.conf TARGET_FPU = "soft" @@ -33,6 +34,11 @@ kernel-module-pl2303 kernel-module-ftdi-sio" UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}" +# Select between multiple alternative providers, if more than one is eligible. +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + PREFERRED_VERSION_glibc ?= "2.2.5" PREFERRED_VERSION_glibc-initial ?= "2.2.5" PREFERRED_VERSION_binutils ?= "2.15.94.0.1" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 2ce73ac836..3beac45143 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -35,3 +35,6 @@ CVSDATE_gnu-config ?= "20050713" CVSDATE_gnu-config-native ?= "20050713" CVSDATE_ipkg-utils-native ?= "20050713" CVSDATE_ipkg-link ?= "20050713" + +CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" +INHERIT += "nslu2-mirrors" diff --git a/conf/tinder.conf b/conf/tinder.conf index 3d65dcb51b..2c50b62a17 100644 --- a/conf/tinder.conf +++ b/conf/tinder.conf @@ -12,7 +12,7 @@ INHERIT += "tinderclient" #One mail/post per task #TINDER_VERBOSE_REPORT = "1" -#TINDER_LOG = "${TMPDIR}/tinder.log" +#TINDER_LOG = "${TMPbDIR}/tinder.log" #TINDER_TREE = "OpenEmbeddedBuild" @@ -30,6 +30,9 @@ INHERIT += "tinderclient" #TINDER_SENDLOG = "http" +# TimeZone handling +#TINDER_TZ = "+0200" + # Do a report at all #TINDER_REPORT = "1" diff --git a/packages/hdparm/hdparm-5.4/.mtn2git_empty b/packages/at76c503a/at76c503a-modules/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/hdparm/hdparm-5.4/.mtn2git_empty +++ b/packages/at76c503a/at76c503a-modules/.mtn2git_empty diff --git a/packages/at76c503a/at76c503a-modules/makefile.cc.patch b/packages/at76c503a/at76c503a-modules/makefile.cc.patch new file mode 100644 index 0000000000..c7a41990d3 --- /dev/null +++ b/packages/at76c503a/at76c503a-modules/makefile.cc.patch @@ -0,0 +1,11 @@ +--- at76c503a/Makefile.old 2005-07-29 21:57:34.000000000 +0200 ++++ at76c503a/Makefile 2005-07-29 21:57:43.000000000 +0200 +@@ -9,7 +9,7 @@ + # the License, or (at your option) any later version. + # + +-CC=gcc ++#CC=gcc + + ifneq (,$(KVERS)) + KERNEL_VERSION=$(KVERS) diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb index 9673e5fb1b..5e56c4787a 100644 --- a/packages/at76c503a/at76c503a-modules_cvs.bb +++ b/packages/at76c503a/at76c503a-modules_cvs.bb @@ -1,14 +1,17 @@ SECTION = "base" LICENSE = "GPL" -SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a" +SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \ + file://makefile.cc.patch;patch=1" S = "${WORKDIR}/at76c503a" -PR = "r1" +PR = "r2" PV = "0.0cvs${CVSDATE}" inherit module -MODULES = "at76c503.o at76_usbdfu.o at76c503-i3861.o at76c503-rfmd.o at76c503-rfmd-acc.o \ - at76c505-rfmd.o at76c503-i3863.o at76c505-rfmd2958.o" +MODULES = "at76c503 at76_usbdfu at76c503-i3861 at76c503-rfmd at76c503-rfmd-acc \ + at76c505-rfmd at76c503-i3863 at76c505-rfmd2958" +MODULES_EXTENSION = "o" +MODULES_EXTENSION_kernel26 = "ko" pkg_postinst() { #!/bin/sh @@ -25,8 +28,9 @@ update-modules || true do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/ - for i in ${MODULES}; do install -m 0644 $i ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/$i; done - + for i in ${MODULES}; do + install -m 0644 $i.${MODULES_EXTENSION} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/ + done if [ "${MACHINE}" = "h3900" ]; then install -d ${D}${sysconfdir}/modutils echo "at76c503-rfmd" > ${D}${sysconfdir}/modutils/at76c503-rfmd diff --git a/packages/base-files/base-files/profile b/packages/base-files/base-files/profile index f24fec92ca..a4c16944b9 100644 --- a/packages/base-files/base-files/profile +++ b/packages/base-files/base-files/profile @@ -5,6 +5,12 @@ PATH="/usr/local/bin:/usr/bin:/bin" EDITOR="/bin/vi" # needed for packages like cron TERM="vt100" # Basic terminal capab. For screen etc. +if [ ! -e /etc/localtime ]; then + TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html + # for an explanation of how to set this to your local timezone. + export TZ +fi + if [ "`id -u`" -eq 0 ]; then PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: fi diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index ec58e08bef..144bf2e135 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r38" +PR = "r39" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/dbus/dbus/dbus-1.init b/packages/dbus/dbus/dbus-1.init index 118b801da7..bd31b6208c 100644 --- a/packages/dbus/dbus/dbus-1.init +++ b/packages/dbus/dbus/dbus-1.init @@ -1,15 +1,17 @@ #! /bin/sh -# -*- coding: iso8859-1 -*- +# -*- coding: utf-8 -*- # Debian init.d script for D-BUS -# Copyright (c) 2003 Colin Walters <walters@debian.org> +# Copyright © 2003 Colin Walters <walters@debian.org> set -e DAEMON=/usr/bin/dbus-daemon-1 NAME=dbus-1 DAEMONUSER=messagebus -PIDFILE=/var/run/dbus/pid +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d test -x $DAEMON || exit 0 @@ -17,41 +19,68 @@ test -x $DAEMON || exit 0 ENABLED=1 PARAMS="" if [ -e /etc/default/dbus-1 ]; then - . /etc/default/dbus-1 + . /etc/default/dbus-1 fi test "$ENABLED" != "0" || exit 0 +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + run-parts --reverse --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --retry 60 --quiet --oknodo --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + case "$1" in start) - echo -n "Starting $DESC: " - if [ ! -d /var/run/dbus ]; then - mkdir /var/run/dbus - chown $DAEMONUSER:$DAEMONUSER /var/run/dbus - fi - start-stop-daemon -S \ - -u $DAEMONUSER -x $DAEMON -- --system $PARAMS - echo "$NAME." - ;; + start_it_up + ;; stop) - echo -n "Stopping $DESC: " - start-stop-daemon -K \ - -u $DAEMONUSER -x $DAEMON -- --system $PARAMS - echo "$NAME." - ;; + shut_it_down + ;; restart|force-reload) - echo -n "Restarting $DESC: " - start-stop-daemon -K \ - -u $DAEMONUSER -x $DAEMON -- --system $PARAMS - sleep 1 - start-stop-daemon -S \ - -u $DAEMONUSER -x $DAEMON -- --system $PARAMS - echo "$NAME." - ;; + shut_it_down + sleep 1 + start_it_up + ;; *) - echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 - exit 1 - ;; + echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; esac exit 0 diff --git a/packages/fbvncserver/fbvncserver_0.9.4.bb b/packages/fbvncserver/fbvncserver_0.9.4.bb index bc66c5c8ac..fd2a1e6138 100644 --- a/packages/fbvncserver/fbvncserver_0.9.4.bb +++ b/packages/fbvncserver/fbvncserver_0.9.4.bb @@ -9,6 +9,7 @@ SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \ file://libvncs0.6.patch;patch=1 \ file://paths.patch;patch=1 \ file://kernelinclude.patch;patch=1 \ + file://buildfix.patch;patch=1 \ file://zaurus_panel.jpg \ file://init" diff --git a/packages/fbvncserver/files/buildfix.patch b/packages/fbvncserver/files/buildfix.patch new file mode 100644 index 0000000000..302dbd9e8e --- /dev/null +++ b/packages/fbvncserver/files/buildfix.patch @@ -0,0 +1,31 @@ +--- fbvncserver-0.9.4/fbvncserver.c.orig 2005-07-31 15:01:32.552177176 +0200 ++++ fbvncserver-0.9.4/fbvncserver.c 2005-07-31 15:02:47.287366483 +0200 +@@ -574,7 +574,6 @@ + rfbScreen = rfbGetScreen(&argc,argv,rfb_width,rfb_height,5,2,2); + rfbScreen->desktopName = DESKTOP_NAME; + rfbScreen->frameBuffer = (char *)rfbbuf; +- rfbScreen->rfbAlwaysShared = TRUE; + rfbScreen->ptrAddEvent = ptrevent; + rfbScreen->kbdAddEvent = keyevent; + rfbScreen->newClientHook = newclient; +@@ -595,18 +594,12 @@ + varblock.b_offset = vscrinfo.blue.offset+vscrinfo.blue.length-5; + varblock.rfb_xres = vscrinfo.yres; + varblock.rfb_maxy = vscrinfo.xres-1; +- while(1) ++ while(1) + { +- /* If no clients are connected, just wait for events and don't bother +- updating the rfb, to save CPU */ +- while(rfbScreen->rfbClientHead==NULL) { +- rfbProcessEvents(rfbScreen,100000); /* We still run a tight loop +- so http clients don't wait */ +- } + /* Process events for a while */ + do + { +- got_event=0; ++ got_event=0; + rfbProcessEvents(rfbScreen,30000); + } + while(got_event); diff --git a/packages/hdparm/hdparm-5.8/.mtn2git_empty b/packages/gcc/gcc-cross-kernel-3.4.4/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/hdparm/hdparm-5.8/.mtn2git_empty +++ b/packages/gcc/gcc-cross-kernel-3.4.4/.mtn2git_empty diff --git a/packages/gcc/gcc-cross-kernel-3.4.4/gcc-3.4.4-makefile-fix.patch b/packages/gcc/gcc-cross-kernel-3.4.4/gcc-3.4.4-makefile-fix.patch new file mode 100644 index 0000000000..74c1f26833 --- /dev/null +++ b/packages/gcc/gcc-cross-kernel-3.4.4/gcc-3.4.4-makefile-fix.patch @@ -0,0 +1,29 @@ +--- gcc-3.4.4/gcc/Makefile.in.orig 2005-07-25 21:00:37 +0200 ++++ gcc-3.4.4/gcc/Makefile.in 2005-07-25 21:01:19 +0200 +@@ -304,7 +304,7 @@ + if [ "$(host)" = "$(target)" ] ; then \ + echo ar; \ + else \ +- t='$(program_transform_name)'; echo ar | sed -e $$t ; \ ++ t='$(program_transform_name)'; echo ar | sed -e "$$t" ; \ + fi; \ + fi` + AR_FLAGS_FOR_TARGET = +@@ -317,7 +317,7 @@ + if [ "$(host)" = "$(target)" ] ; then \ + echo $(RANLIB); \ + else \ +- t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \ ++ t='$(program_transform_name)'; echo ranlib | sed -e "$$t" ; \ + fi; \ + fi` + NM_FOR_TARGET = ` \ +@@ -329,7 +329,7 @@ + if [ "$(host)" = "$(target)" ] ; then \ + echo nm; \ + else \ +- t='$(program_transform_name)'; echo nm | sed -e $$t ; \ ++ t='$(program_transform_name)'; echo nm | sed -e "$$t" ; \ + fi; \ + fi` + diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb new file mode 100644 index 0000000000..368cbb1e47 --- /dev/null +++ b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb @@ -0,0 +1,19 @@ +SECTION = "devel" +# cut-down gcc for kernel builds +# only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. + +include gcc-cross-initial_${PV}.bb + +PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" + +SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1" + +do_install () { + : +} + +do_stage () { + cd gcc + oe_runmake install-common install-headers install-libgcc + install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV} +} diff --git a/packages/gmp/gmp-4.1.2/gcc-compile.patch b/packages/gmp/gmp-4.1.2/gcc-compile.patch new file mode 100644 index 0000000000..4d880123e9 --- /dev/null +++ b/packages/gmp/gmp-4.1.2/gcc-compile.patch @@ -0,0 +1,72 @@ + diff -Naur gmp-4.1.2.orig/mpf/ceilfloor.c gmp-4.1.2/mpf/ceilfloor.c + --- gmp-4.1.2.orig/mpf/ceilfloor.c 2001-05-10 22:31:13.000000000 +0000 + +++ gmp-4.1.2/mpf/ceilfloor.c 2004-04-25 03:48:20.823016075 +0000 + @@ -31,7 +31,7 @@ + static void __gmpf_ceil_or_floor _PROTO ((REGPARM_2_1 (mpf_ptr r, mpf_srcptr u, int dir))) REGPARM_ATTR (1); + #define mpf_ceil_or_floor(r,u,dir) __gmpf_ceil_or_floor (REGPARM_2_1 (r, u, dir)) + + -static void + +REGPARM_ATTR (1) static void + mpf_ceil_or_floor (mpf_ptr r, mpf_srcptr u, int dir) + { + mp_ptr rp, up, p; + diff -Naur gmp-4.1.2.orig/mpq/aors.c gmp-4.1.2/mpq/aors.c + --- gmp-4.1.2.orig/mpq/aors.c 2001-09-01 22:41:02.000000000 +0000 + +++ gmp-4.1.2/mpq/aors.c 2004-04-25 03:48:20.826015531 +0000 + @@ -27,7 +27,7 @@ + static void __gmpq_aors _PROTO ((REGPARM_3_1 (mpq_ptr w, mpq_srcptr x, mpq_srcptr y, void (*fun) _PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr))))) REGPARM_ATTR (1); + #define mpq_aors(w,x,y,fun) __gmpq_aors (REGPARM_3_1 (w, x, y, fun)) + + -static void + +REGPARM_ATTR (1) static void + mpq_aors (mpq_ptr rop, mpq_srcptr op1, mpq_srcptr op2, + void (*fun) _PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr))) + { + diff -Naur gmp-4.1.2.orig/mpz/aorsmul.c gmp-4.1.2/mpz/aorsmul.c + --- gmp-4.1.2.orig/mpz/aorsmul.c 2001-05-02 22:30:07.000000000 +0000 + +++ gmp-4.1.2/mpz/aorsmul.c 2004-04-25 03:48:20.828015169 +0000 + @@ -39,7 +39,7 @@ + static void __gmpz_aorsmul _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub))) REGPARM_ATTR (1); + #define mpz_aorsmul(w,x,y,sub) __gmpz_aorsmul (REGPARM_3_1 (w, x, y, sub)) + + -static void + +REGPARM_ATTR (1) static void + mpz_aorsmul (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub) + { + mp_size_t xsize, ysize, tsize, wsize, wsize_signed; + diff -Naur gmp-4.1.2.orig/mpz/aorsmul_i.c gmp-4.1.2/mpz/aorsmul_i.c + --- gmp-4.1.2.orig/mpz/aorsmul_i.c 2002-05-14 16:59:49.000000000 +0000 + +++ gmp-4.1.2/mpz/aorsmul_i.c 2004-04-25 03:49:07.962471904 +0000 + @@ -57,7 +57,7 @@ + twos-complement negative y doesn't work, because it effectively adds an + extra x * 2^BITS_PER_MP_LIMB. */ + + -void + +REGPARM_ATTR (1) void + mpz_aorsmul_1 (mpz_ptr w, mpz_srcptr x, mp_limb_t y, mp_size_t sub) + { + mp_size_t xsize, wsize, wsize_signed, new_wsize, min_size, dsize; + diff -Naur gmp-4.1.2.orig/mpz/cfdiv_q_2exp.c gmp-4.1.2/mpz/cfdiv_q_2exp.c + --- gmp-4.1.2.orig/mpz/cfdiv_q_2exp.c 2002-02-08 21:55:17.000000000 +0000 + +++ gmp-4.1.2/mpz/cfdiv_q_2exp.c 2004-04-25 03:48:20.830014806 +0000 + @@ -29,7 +29,7 @@ + static void __gmpz_cfdiv_q_2exp _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir))) REGPARM_ATTR (1); + #define cfdiv_q_2exp(w,u,cnt,dir) __gmpz_cfdiv_q_2exp (REGPARM_3_1 (w,u,cnt,dir)) + + -static void + +REGPARM_ATTR (1) static void + cfdiv_q_2exp (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir) + { + mp_size_t wsize, usize, abs_usize, limb_cnt, i; + diff -Naur gmp-4.1.2.orig/mpz/cfdiv_r_2exp.c gmp-4.1.2/mpz/cfdiv_r_2exp.c + --- gmp-4.1.2.orig/mpz/cfdiv_r_2exp.c 2002-04-18 16:48:25.000000000 +0000 + +++ gmp-4.1.2/mpz/cfdiv_r_2exp.c 2004-04-25 03:48:20.832014444 +0000 + @@ -32,7 +32,7 @@ + static void __gmpz_cfdiv_r_2exp _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir))) REGPARM_ATTR (1); + #define cfdiv_r_2exp(w,u,cnt,dir) __gmpz_cfdiv_r_2exp (REGPARM_3_1 (w, u, cnt, dir)) + + -static void + +REGPARM_ATTR (1) static void + cfdiv_r_2exp (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir) + { + mp_size_t usize, abs_usize, limb_cnt, i; diff --git a/packages/gmp/gmp_4.1.2.bb b/packages/gmp/gmp_4.1.2.bb index b19d122ddf..d7456175a1 100644 --- a/packages/gmp/gmp_4.1.2.bb +++ b/packages/gmp/gmp_4.1.2.bb @@ -5,7 +5,8 @@ LICENSE = "GPL LGPL" SRC_URI = "ftp://mirrors.kernel.org/gnu/gmp/gmp-${PV}.tar.gz \ file://configure.patch;patch=1 \ - file://amd64.patch;patch=1" + file://amd64.patch;patch=1 \ + file://gcc-compile.patch;patch=1 " inherit autotools diff --git a/packages/gnome/gnome-mime-data_2.4.2.bb b/packages/gnome/gnome-mime-data_2.4.2.bb new file mode 100644 index 0000000000..1a49ed8e72 --- /dev/null +++ b/packages/gnome/gnome-mime-data_2.4.2.bb @@ -0,0 +1,5 @@ +LICENSE = "GPL" +inherit gnome + +DEPENDS += "intltool-native" +PR = "r1" diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty b/packages/gnome/libbonobo/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty +++ b/packages/gnome/libbonobo/.mtn2git_empty diff --git a/packages/gnome/libbonobo/gtk-doc.m4 b/packages/gnome/libbonobo/gtk-doc.m4 new file mode 100644 index 0000000000..3ec41666b2 --- /dev/null +++ b/packages/gnome/libbonobo/gtk-doc.m4 @@ -0,0 +1,53 @@ +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + dnl for overriding the documentation installation directory + AC_ARG_WITH(html-dir, + AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST(HTML_DIR) + + dnl enable/disable documentation building + AC_ARG_ENABLE(gtk-doc, + AC_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [default=no]]),, + enable_gtk_doc=no) + + have_gtk_doc=no + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then + have_gtk_doc=yes + fi + + dnl do we want to do a version check? +ifelse([$1],[],, + [gtk_doc_min_version=$1 + if test "$have_gtk_doc" = yes; then + AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) + if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + have_gtk_doc=no + fi + fi +]) + if test x$enable_gtk_doc = xyes; then + if test "$have_gtk_doc" != yes; then + enable_gtk_doc=no + fi + fi + + AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) + AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") +]) diff --git a/packages/gnome/libbonobo/gtk-doc.make b/packages/gnome/libbonobo/gtk-doc.make new file mode 100644 index 0000000000..c319e7ad7c --- /dev/null +++ b/packages/gnome/libbonobo/gtk-doc.make @@ -0,0 +1,148 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE).types \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) + @echo '*** Scanning header files ***' + @-chmod -R u+w $(srcdir) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo '*** Rebuilding template files ***' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml + @echo '*** Building XML ***' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo '*** Building HTML ***' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo '-- Fixing Crossreferences' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp +endif + +############## + +clean-local: + rm -f *~ *.bak + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) + (installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + fi) + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + -cp $(srcdir)/html/* $(distdir)/html + +.PHONY : dist-hook-local diff --git a/packages/gnome/libbonobo_2.10.0.bb b/packages/gnome/libbonobo_2.10.0.bb new file mode 100644 index 0000000000..bd51d4e45a --- /dev/null +++ b/packages/gnome/libbonobo_2.10.0.bb @@ -0,0 +1,59 @@ +LICENSE = "GPL" +PR = "r1" +SECTION = "x11/gnome/libs" +DESCRIPTION = "Bonobo CORBA interfaces library" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-${PV}.tar.bz2 \ + file://gtk-doc.m4 \ + file://gtk-doc.make" +DEPENDS = "glib-2.0 orbit2 intltool-native libxml2" +ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2" + +FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so" +FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \ + ${libdir}/bonobo-2.0/samples" + +inherit autotools pkgconfig + +PARALLEL_MAKE = "" + +do_configure_prepend() { + install -d m4 + install ${WORKDIR}/gtk-doc.m4 m4/ + install ${WORKDIR}/gtk-doc.make ./ +} + +ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \ + bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \ + bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \ + bonobo-activation-server-info.h bonobo-activation-version.h" + +BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \ + bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \ + bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \ + bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \ + bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \ + bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \ + bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h \ + bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \ + bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \ + bonobo-app-client.h bonobo-application.h" + +do_compile() { + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" +} + +do_stage() { + install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation + for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done + install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo + for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done + install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/ + install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ + install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ + oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR} + oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR} +} + +do_install() { + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install +} diff --git a/packages/gnome/libbonoboui_2.10.0.bb b/packages/gnome/libbonoboui_2.10.0.bb new file mode 100644 index 0000000000..719fe2395a --- /dev/null +++ b/packages/gnome/libbonoboui_2.10.0.bb @@ -0,0 +1,57 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r1" + +inherit gnome pkgconfig + +FILES_${PN} += "${libdir}/libglade/2.0/*.so" +FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \ + ${libdir}/bonobo-2.0/samples" + +DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade" + +EXTRA_OECONF = "--disable-gtk-doc" + +HEADERS = " \ +bonobo/bonobo-zoomable.h \ +bonobo/bonobo-ui-component.h \ +bonobo/bonobo-dock-layout.h \ +bonobo/bonobo-ui-type-builtins.h \ +bonobo/bonobo-canvas-component.h \ +bonobo/bonobo-widget.h \ +bonobo/bonobo-ui-engine.h \ +bonobo/bonobo-window.h \ +bonobo/bonobo-ui-toolbar.h \ +bonobo/bonobo-dock-band.h \ +bonobo/bonobo-ui-toolbar-item.h \ +bonobo/bonobo-control.h \ +bonobo/bonobo-dock-item.h \ +bonobo/bonobo-ui-config-widget.h \ +bonobo/bonobo-zoomable-frame.h \ +bonobo/bonobo-control-frame.h \ +bonobo/bonobo-dock.h \ +bonobo/bonobo-ui-main.h \ +bonobo/bonobo-canvas-item.h \ +bonobo/bonobo-ui-node.h \ +bonobo/bonobo-socket.h \ +bonobo/bonobo-selector.h \ +bonobo/bonobo-ui-sync.h \ +bonobo/bonobo-ui-util.h \ +bonobo/bonobo-plug.h \ +bonobo/bonobo-ui-toolbar-button-item.h \ +bonobo/bonobo-ui-toolbar-toggle-button-item.h \ +bonobo/bonobo-ui-container.h \ +bonobo/bonobo-file-selector-util.h \ +bonobo/bonobo-property-control.h \ +bonobo/bonobo-selector-widget.h \ +libbonoboui.h \ +bonobo.h \ +" + +do_stage() { + install -d ${STAGING_INCDIR}/libbonoboui-2.0/bonobo + for i in ${HEADERS}; do + install -m 0644 $i ${STAGING_INCDIR}/libbonoboui-2.0/$i + done + oe_libinstall -C bonobo -a -so libbonoboui-2 ${STAGING_LIBDIR} +} diff --git a/packages/gnome/libgnome_2.10.1.bb b/packages/gnome/libgnome_2.10.1.bb new file mode 100644 index 0000000000..531fdd4240 --- /dev/null +++ b/packages/gnome/libgnome_2.10.1.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r1" + +inherit gnome + +DEPENDS = "gnome-vfs libbonobo" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + oe_libinstall -C libgnome -a -so libgnome-2 ${STAGING_LIBDIR} + gnome_stage_includes +} diff --git a/packages/gnome/libgnomecanvas_2.10.2.bb b/packages/gnome/libgnomecanvas_2.10.2.bb new file mode 100644 index 0000000000..36ee1aa67f --- /dev/null +++ b/packages/gnome/libgnomecanvas_2.10.2.bb @@ -0,0 +1,16 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r1" +DESCRIPTION = "A powerful object-oriented display" +inherit gnome + +DEPENDS = "gnome-vfs libbonobo libglade libart-lgpl" + +EXTRA_OECONF = "--disable-gtk-doc" + +FILES_${PN} += "${libdir}/libglade/*/libcanvas.so" + +do_stage() { + gnome_stage_includes + oe_libinstall -C libgnomecanvas -a -so libgnomecanvas-2 ${STAGING_LIBDIR} +} diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb new file mode 100644 index 0000000000..5dcf78cb0d --- /dev/null +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb @@ -0,0 +1,52 @@ +PR = "r0" + +SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz" +DESCRIPTION = "A lightweight webbrowser for the GPE platform" +LICENSE = "GPL" +DEPENDS = "osb-nrcit" + +S = "${WORKDIR}/gpe-mini-browser-${PV}" + +inherit autotools + +do_install() { + # install -d ${D}${docdir}/gpe + # install -m 0644 ${S}/gpe-mini-browser.html ${D}${docdir}/gpe/ + install -d ${D}/usr/share/applications + install -m 0644 ${S}/gpe-mini-browser.desktop ${D}/usr/share/applications/gpe-mini-browser.desktop + install -d ${D}/usr/share/pixmaps + install -m 0644 ${S}/gpe-mini-browser.png ${D}/usr/share/pixmaps/gpe-mini-browser.png + autotools_do_install +} + +pkg_postinst_${PN}-doc () { + #!/bin/sh + if [ "x$D" != "x" ]; then + if [ -e /etc/gpe/gpe-help.conf ]; then + echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf + else + echo [Help] >> /etc/gpe/gpe-help.conf + echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf + fi + if [ -x /usr/bin/gpe-helpindex ]; then + echo generating help-index + gpe-helpindex + else + echo not generating index for gpe-mini-browser + fi + fi +} + +pkg_postrm_${PN}-doc () { + #!/bin/sh + if [ -e /etc/gpe/gpe-help.conf ]; then + sed '/^\<gpe-mini-browser\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf + mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf + fi + if [ -x /usr/bin/gpe-helpindex ]; then + echo generating help-index + gpe-helpindex + else + echo not generating index for gpe-mini-browser + fi +} diff --git a/packages/gzip/gzip_1.3.5.bb b/packages/gzip/gzip_1.3.5.bb index e99c76dcb4..a138221367 100644 --- a/packages/gzip/gzip_1.3.5.bb +++ b/packages/gzip/gzip_1.3.5.bb @@ -5,6 +5,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>" DESCRIPTION = "gzip (GNU zip) is a compression utility designed \ to be a replacement for 'compress'. The GNU Project uses it as \ the standard compression program for its system." +PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \ file://configure.patch;patch=1" @@ -12,3 +13,25 @@ SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \ S = "${WORKDIR}/gzip-${PV}" inherit autotools + +do_install () { + autotools_do_install + # Rename and move files into /bin (FHS) + install -d ${D}${base_bindir} + mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN} + mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN} + mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100 + update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100 + update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove gunzip gunzip.${PN} + update-alternatives --remove gzip gzip.${PN} + update-alternatives --remove zcat zcat.${PN} +} + diff --git a/packages/hdparm/hdparm-5.4/bswap.patch b/packages/hdparm/hdparm-5.4/bswap.patch deleted file mode 100644 index 13670073a4..0000000000 --- a/packages/hdparm/hdparm-5.4/bswap.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c ---- hdparm-5.4/hdparm.c 2004-07-14 01:29:30.000000000 +0200 -+++ hdparm-5.4-fix/hdparm.c 2004-07-14 01:28:31.000000000 +0200 -@@ -20,7 +20,9 @@ - #include <linux/types.h> - #include <linux/hdreg.h> - #include <linux/major.h> --#include <asm/byteorder.h> -+#include <byteswap.h> -+ -+#define le16_to_cpus(x) bswap_16(htons(x)) - - #include "hdparm.h" - -@@ -1299,7 +1301,7 @@ - } - } - for(i=0; i<(sizeof args)/2; i+=2) { -- __le16_to_cpus((__u16 *)(&args[i])); -+ le16_to_cpus(*(__u16 *)(&args[i])); - } - identify((void *)&args[4], NULL); - identify_abort: ; -@@ -1499,7 +1501,7 @@ - } - for (i = 0; count >= 4; ++i) { - sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]); -- __le16_to_cpus((__u16 *)(&sbuf[i])); -+ le16_to_cpus((__u16 *)(&sbuf[i])); - b += 5; - count -= 5; - } diff --git a/packages/hdparm/hdparm-5.4/readahead.patch b/packages/hdparm/hdparm-5.4/readahead.patch deleted file mode 100644 index 2868d940d0..0000000000 --- a/packages/hdparm/hdparm-5.4/readahead.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c ---- hdparm-5.4/hdparm.c 2004-07-14 00:36:03.000000000 +0200 -+++ hdparm-5.4-fix/hdparm.c 2003-04-18 22:29:38.000000000 +0200 -@@ -52,7 +52,7 @@ - static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0; - static int do_ctimings, do_timings = 0; - --static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0; -+static unsigned long set_readahead= 0, get_readahead= 0, readahead_state= 0; - static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; - static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; - static unsigned long set_mult = 0, get_mult = 0, mult = 0; -@@ -785,8 +785,8 @@ - - if (set_readahead) { - if (get_readahead) -- printf(" setting fs readahead to %ld\n", readahead); -- if (ioctl(fd, BLKRASET, readahead)) -+ printf(" setting fs readahead to %ld\n", readahead_state); -+ if (ioctl(fd, BLKRASET, readahead_state)) - perror(" BLKRASET failed"); - } - #ifdef HDIO_UNREGISTER_HWIF -@@ -1830,7 +1830,7 @@ - case 'a': - get_readahead = noisy; - noisy = 1; -- GET_NUMBER(set_readahead,readahead); -+ GET_NUMBER(set_readahead,readahead_state); - break; - case 'B': - get_apmmode = noisy; diff --git a/packages/hdparm/hdparm-5.8/readahead.patch b/packages/hdparm/hdparm-5.8/readahead.patch deleted file mode 100644 index 2868d940d0..0000000000 --- a/packages/hdparm/hdparm-5.8/readahead.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c ---- hdparm-5.4/hdparm.c 2004-07-14 00:36:03.000000000 +0200 -+++ hdparm-5.4-fix/hdparm.c 2003-04-18 22:29:38.000000000 +0200 -@@ -52,7 +52,7 @@ - static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0; - static int do_ctimings, do_timings = 0; - --static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0; -+static unsigned long set_readahead= 0, get_readahead= 0, readahead_state= 0; - static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; - static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; - static unsigned long set_mult = 0, get_mult = 0, mult = 0; -@@ -785,8 +785,8 @@ - - if (set_readahead) { - if (get_readahead) -- printf(" setting fs readahead to %ld\n", readahead); -- if (ioctl(fd, BLKRASET, readahead)) -+ printf(" setting fs readahead to %ld\n", readahead_state); -+ if (ioctl(fd, BLKRASET, readahead_state)) - perror(" BLKRASET failed"); - } - #ifdef HDIO_UNREGISTER_HWIF -@@ -1830,7 +1830,7 @@ - case 'a': - get_readahead = noisy; - noisy = 1; -- GET_NUMBER(set_readahead,readahead); -+ GET_NUMBER(set_readahead,readahead_state); - break; - case 'B': - get_apmmode = noisy; diff --git a/packages/unionfs/unionfs-1.0.7/.mtn2git_empty b/packages/hdparm/hdparm-6.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/unionfs/unionfs-1.0.7/.mtn2git_empty +++ b/packages/hdparm/hdparm-6.1/.mtn2git_empty diff --git a/packages/hdparm/hdparm-5.8/bswap.patch b/packages/hdparm/hdparm-6.1/bswap.patch index 37fbcb7b38..37fbcb7b38 100644 --- a/packages/hdparm/hdparm-5.8/bswap.patch +++ b/packages/hdparm/hdparm-6.1/bswap.patch diff --git a/packages/hdparm/hdparm-5.8/uclibc.patch b/packages/hdparm/hdparm-6.1/uclibc.patch index 495d7491bb..495d7491bb 100644 --- a/packages/hdparm/hdparm-5.8/uclibc.patch +++ b/packages/hdparm/hdparm-6.1/uclibc.patch diff --git a/packages/hdparm/hdparm_5.4.bb b/packages/hdparm/hdparm_5.4.bb deleted file mode 100644 index 21b5bd5d4d..0000000000 --- a/packages/hdparm/hdparm_5.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "hdparm is a Linux shell utility for viewing \ -and manipulating various IDE drive and driver parameters." -SECTION = "console/utils" -PRIORITY = "optional" -LICENSE = "BSD" -PR = "r1" - -SRC_URI = "http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-${PV}.tar.gz \ - file://bswap.patch;patch=1 \ - file://readahead.patch;patch=1" - -do_install () { - install -d ${D}${sbindir} ${D}${mandir}/man8 - oe_runmake 'DESTDIR=${D}' install -} diff --git a/packages/hdparm/hdparm_5.8.bb b/packages/hdparm/hdparm_6.1.bb index a917289513..a917289513 100644 --- a/packages/hdparm/hdparm_5.8.bb +++ b/packages/hdparm/hdparm_6.1.bb diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index 311a2764da..99a469d576 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -1,64 +1,138 @@ #!/bin/sh . /etc/default/rcS -CFGFILE="/etc/default/volatiles" + +CFGDIR="/etc/default/volatiles" +TMPROOT="/var/tmp" +COREDEF="00_core" [ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems." -cat ${CFGFILE} | grep -v "^#" | \ -while read LINE; do - TTYPE=`echo ${LINE} | cut -d " " -f 1` - TUSER=`echo ${LINE} | cut -d " " -f 2` - TGROUP=`echo ${LINE} | cut -d " " -f 3` - TMODE=`echo ${LINE} | cut -d " " -f 4` - TNAME=`echo ${LINE} | cut -d " " -f 5` - [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-." +check_requirements() { - [ "${TTYPE}" = "l" ] && { - [ -e "${TNAME}" ] && { - echo "Cannot create link over existing -${TNAME}-." >&2 - } || { - TSOURCE=`echo ${LINE} | cut -d " " -f 6` - [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-." - ln -s "${TSOURCE}" "${TNAME}" - } - continue + cleanup() { + rm "${TMP_INTERMED}" + rm "${TMP_DEFINED}" + rm "${TMP_COMBINED}" } + + CFGFILE="$1" - [ -L "${TNAME}" ] && { - [ "${VERBOSE}" != "no" ] && echo "Found link." - NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'` - echo ${NEWNAME} | grep -v "^/" >/dev/null && { - TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}" - [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-." - } || { - TNAME="${NEWNAME}" - [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-." - } + [ `basename "${CFGFILE}"` = "${COREDEF}" ] && return 0 + + TMP_INTERMED="${TMPROOT}/tmp.$$" + TMP_DEFINED="${TMPROOT}/tmpdefined.$$" + TMP_COMBINED="${TMPROOT}/tmpcombined.$$" + + + cat /etc/passwd | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}" + cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 2 > "${TMP_INTERMED}" + cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}" + + NR_DEFINED_USERS="`cat "${TMP_DEFINED}" | wc -l`" + NR_COMBINED_USERS="`cat "${TMP_COMBINED}" | wc -l`" + + [ "${NR_DEFINED_USERS}" -ne "${NR_COMBINED_USERS}" ] && { + echo "Undefined users:" + diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>" + cleanup + return 1 + } + + + cat /etc/group | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}" + cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 3 > "${TMP_INTERMED}" + cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}" + + NR_DEFINED_GROUPS="`cat "${TMP_DEFINED}" | wc -l`" + NR_COMBINED_GROUPS="`cat "${TMP_COMBINED}" | wc -l`" + + [ "${NR_DEFINED_GROUPS}" -ne "${NR_COMBINED_GROUPS}" ] && { + echo "Undefined groups:" + diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>" + cleanup + return 1 } - [ -e "${TNAME}" ] && { - [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping." - continue + # Add checks for required directories here + + cleanup + return 0 + } + +apply_cfgfile() { + + CFGFILE="$1" + + check_requirements "${CFGFILE}" || { + echo "Skipping ${CFGFILE}" + return 1 } - case "${TTYPE}" in - "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-." - touch "${TNAME}" - ;; - "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-." - mkdir -p "${TNAME}" - # Add check to see if there's an entry in fstab to mount. - ;; - *) [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-." - continue - ;; - esac - - chown ${TUSER} ${TNAME} || echo "Failed to set owner -${TUSER}- for -${TNAME}-." >&2 - chgrp ${TGROUP} ${TNAME} || echo "Failed to set group -${TGROUP}- for -${TNAME}-." >&2 - chmod ${TMODE} ${TNAME} || echo "Failed to set mode -${TMODE}- for -${TNAME}-." >&2 + cat ${CFGFILE} | grep -v "^#" | \ + while read LINE; do + TTYPE=`echo ${LINE} | cut -d " " -f 1` + TUSER=`echo ${LINE} | cut -d " " -f 2` + TGROUP=`echo ${LINE} | cut -d " " -f 3` + TMODE=`echo ${LINE} | cut -d " " -f 4` + TNAME=`echo ${LINE} | cut -d " " -f 5` + + [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-." + + [ "${TTYPE}" = "l" ] && { + [ -e "${TNAME}" ] && { + echo "Cannot create link over existing -${TNAME}-." >&2 + } || { + TSOURCE=`echo ${LINE} | cut -d " " -f 6` + [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-." + ln -s "${TSOURCE}" "${TNAME}" + } + continue + } + + [ -L "${TNAME}" ] && { + [ "${VERBOSE}" != "no" ] && echo "Found link." + NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'` + echo ${NEWNAME} | grep -v "^/" >/dev/null && { + TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}" + [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-." + } || { + TNAME="${NEWNAME}" + [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-." + } + } + + [ -e "${TNAME}" ] && { + [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping." + continue + } + + case "${TTYPE}" in + "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-." + touch "${TNAME}" + ;; + "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-." + mkdir -p "${TNAME}" + # Add check to see if there's an entry in fstab to mount. + ;; + *) [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-." + continue + ;; + esac + + chown ${TUSER} ${TNAME} || echo "Failed to set owner -${TUSER}- for -${TNAME}-." >&2 + chgrp ${TGROUP} ${TNAME} || echo "Failed to set group -${TGROUP}- for -${TNAME}-." >&2 + chmod ${TMODE} ${TNAME} || echo "Failed to set mode -${TMODE}- for -${TNAME}-." >&2 + + done + + return 0 + + } + +for file in `ls -1 "${CFGDIR}" | sort`; do + apply_cfgfile "${CFGDIR}/${file}" done diff --git a/packages/initscripts/initscripts-openslug_1.0.bb b/packages/initscripts/initscripts-openslug_1.0.bb index b5252bfdeb..4e82022876 100644 --- a/packages/initscripts/initscripts-openslug_1.0.bb +++ b/packages/initscripts/initscripts-openslug_1.0.bb @@ -11,7 +11,7 @@ RCONFLICTS = "initscripts" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.2" +PR := "${PR}.3" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" @@ -96,7 +96,7 @@ do_install_append() { # checkfs.sh is currently disabled from S 30 (and won't work on OpenSlug) # ramdisk is not used on OpenSlug, would run at S 30 update-rc.d -r ${D} mountall.sh start 35 S . - # base-files populate-var.sh runs at S37 + # base-files populate-volatile.sh runs at S37 update-rc.d -r ${D} devpts.sh start 38 S . # openslug file syslog starts here (39) diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 76755e1744..5e7d6fe44c 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r51" +PR = "r52" SRC_URI = "file://halt \ file://ramdisk \ @@ -66,7 +66,8 @@ do_install () { ${D}${sysconfdir}/rc4.d \ ${D}${sysconfdir}/rc5.d \ ${D}${sysconfdir}/rc6.d \ - ${D}${sysconfdir}/default + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/default/volatiles install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/checkroot.sh ${D}${sysconfdir}/init.d @@ -86,7 +87,7 @@ do_install () { install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ "${TARGET_ARCH}" = "arm" ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d fi diff --git a/packages/ipkg/ipkg-native.inc b/packages/ipkg/ipkg-native.inc new file mode 100644 index 0000000000..b52b7b5e20 --- /dev/null +++ b/packages/ipkg/ipkg-native.inc @@ -0,0 +1,12 @@ +# NOTE: ipkg now obeys ${libdir}, so ipkg-native now installs +# things into the wrong location inside of offline_root. Backup +# the target libdir and use that. +target_libdir := "${libdir}" + +inherit native + +EXTRA_OECONF += "--with-ipkgdir=${target_libdir}/ipkg" + +DEPENDS = "libtool-native automake-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}" +PROVIDES = "" diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc new file mode 100644 index 0000000000..f535cfbef0 --- /dev/null +++ b/packages/ipkg/ipkg.inc @@ -0,0 +1,51 @@ +DESCRIPTION = "Itsy Package Manager" +DESCRIPTION_libipkg = "Itsy Package Manager Library" +SECTION = "base" +LICENSE = "GPL" +PROVIDES = "virtual/ipkg libipkg" + +PACKAGES =+ "libipkg-dev libipkg" +FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" +FILES_libipkg = "${libdir}" +AUTO_LIBNAME_PKGS = "libipkg" + +SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://terse.patch;patch=1" + +S = "${WORKDIR}/ipkg/C" + +inherit autotools pkgconfig + +pkg_postinst_ipkg () { +#!/bin/sh +if [ "x$D" != "x" ]; then + install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d + # this happens at S98 where our good 'ole packages script used to run + echo -e "#!/bin/sh +ipkg-cl configure +" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure + chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure +fi + +update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100 +} + +pkg_postrm_ipkg () { +#!/bin/sh +update-alternatives --remove ipkg ${bindir}/ipkg-cl +} + +do_stage() { + oe_libinstall -so libipkg ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/replace/ + install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/ + install -d ${STAGING_INCDIR}/libipkg/ + for f in *.h + do + install -m 0644 $f ${STAGING_INCDIR}/libipkg/ + done +} + +# +# FIXME: Install /etc/ipkg.conf and /etc/ipkg/arch.conf +# diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index 9225cb3df7..84d037d330 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -2,12 +2,13 @@ DEPENDS = "ixp4xx-csr patcher-native" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPatch-1_1.zip \ + http://nslu.sourceforge.net/downloads/ixp425_eth.c.patch \ file://makefile.patch;patch=1 \ file://ethhdr.patch;patch=1 \ file://intdriven.patch;patch=1 \ file://pollcontroller.patch;patch=1 \ file://mm4.patch;patch=1" -PR = "r5" +PR = "r7" S = "${WORKDIR}" @@ -21,21 +22,21 @@ inherit module KERNEL_CC += "${TARGET_CC_ARCH} -mno-thumb-interwork" # KERNEL_LD += -do_ixp425_c_patch_fetch () { - if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then - cd ${DL_DIR} - wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193 - md5sum > ixp425_eth.c.patch.md5 - fi -} - -addtask ixp425_c_patch_fetch after do_fetch before do_unpack - -do_ixp425_c_patch_unpack () { - install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/ -} - -addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch +#do_ixp425_c_patch_fetch () { +# if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then +# cd ${DL_DIR} +# wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193 +# md5sum > ixp425_eth.c.patch.md5 +# fi +#} +# +#addtask ixp425_c_patch_fetch after do_fetch before do_unpack + +#do_ixp425_c_patch_unpack () { +# install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/ +#} + +#addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch do_pre_patch () { patcher -p 0 -i ixp425_eth_1_1_update_nf_bridge.patch diff --git a/packages/unionfs/unionfs-1.0.8/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/unionfs/unionfs-1.0.8/.mtn2git_empty +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch index 85d07191b9..85d07191b9 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch index 22a6fd3943..22a6fd3943 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0 index b993f2ac26..b993f2ac26 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0 diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie index 9f51b61169..9f51b61169 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6 index 8b41380784..8b41380784 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6 +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6 diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle index 42a851dd5f..42a851dd5f 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz index ed5010d5c8..ed5010d5c8 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa index c7eba4a337..c7eba4a337 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch index a2dbce3325..a2dbce3325 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch index ee761b75ad..ee761b75ad 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb index d93006ffa7..ef1a97d2e4 100644 --- a/packages/linux/linux-openzaurus_2.6.11.bb +++ b/packages/linux/linux-openzaurus_2.6.11.bb @@ -21,31 +21,31 @@ JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files/" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ http://www.kernel.org/pub/linux/kernel/people/rml/inotify/v2.6/0.22/inotify-0.22-rml-2.6.11-1.patch;patch=1 \ ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \ - ${RPSRC}/rndis_fix-r0.patch;patch=1 \ - ${RPSRC}/w100_malloc-r2.patch;patch=1 \ - ${RPSRC}/pxairq_printk-r0.patch;patch=1 \ - ${RPSRC}/corgi_kbd-r14.patch;patch=1 \ - ${RPSRC}/corgi_ts-r10.patch;patch=1 \ - ${RPSRC}/sharp_multi_scoop-r1.patch;patch=1 \ - ${RPSRC}/corgi_kbd1-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_param-r5.patch;patch=1 \ + ${RPSRC}/archive/rndis_fix-r0.patch;patch=1 \ + ${RPSRC}/archive/w100_malloc-r2.patch;patch=1 \ + ${RPSRC}/archive/pxairq_printk-r0.patch;patch=1 \ + ${RPSRC}/archive/corgi_kbd-r14.patch;patch=1 \ + ${RPSRC}/archive/corgi_ts-r10.patch;patch=1 \ + ${RPSRC}/archive/sharp_multi_scoop-r1.patch;patch=1 \ + ${RPSRC}/archive/corgi_kbd1-r0.patch;patch=1 \ + ${RPSRC}/archive/sharpsl_param-r5.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ - ${RPSRC}/pxa_irda-r1.patch;patch=1 \ - ${RPSRC}/pxaudc_susres-r1.patch;patch=1 \ + ${RPSRC}/archive/pxa_irda-r1.patch;patch=1 \ + ${RPSRC}/archive/pxaudc_susres-r1.patch;patch=1 \ ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ - ${RPSRC}/pxa_turbo-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_mapprom-r1.patch;patch=1 \ - ${RPSRC}/input_power-r1.patch;patch=1 \ + ${RPSRC}/archive/pxa_turbo-r0.patch;patch=1 \ + ${RPSRC}/archive/sharpsl_mapprom-r1.patch;patch=1 \ + ${RPSRC}/archive/input_power-r1.patch;patch=1 \ ${RPSRC}/corgi_irda-r2.patch;patch=1 \ ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ - ${RPSRC}/corgi_power-r22.patch;patch=1 \ + ${RPSRC}/archive/corgi_power-r22.patch;patch=1 \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ - ${RPSRC}/ide_fixes-r1.patch;patch=1 \ - ${RPSRC}/mmc_sd-r4.patch;patch=1 \ + ${RPSRC}/archive/ide_fixes-r1.patch;patch=1 \ + ${RPSRC}/archive/mmc_sd-r4.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/corgi_snd-r6.patch;patch=1 \ - ${RPSRC}/w100_split-r5-r1.patch;patch=1 \ + ${RPSRC}/archive/w100_split-r5-r1.patch;patch=1 \ ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \ ${DOSRC}/tc6393-device-r2.patch;patch=1 \ ${DOSRC}/tc6393_nand-r2.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb index 4f764c7803..2c7042c7ca 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r2" +PR = "r0" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -23,10 +23,9 @@ BASRC = "http://www.orca.cx/zaurus/patches" # Patches submitted upstream are towards top of this list SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc3.bz2;patch=1 \ - ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm1/2.6.13-rc3-mm1.bz2;patch=1 \ - ${RPSRC}/nand_softlockup-r0.patch;patch=1 \ - ${RPSRC}/oprofile_irqfix-r0.patch;patch=1 \ - ${RPSRC}/preempt_nwfpe-r1.patch;patch=1 \ + ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm3/2.6.13-rc3-mm3.bz2;patch=1 \ + ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \ + ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \ ${RPSRC}/oprofile_typo-r0.patch;patch=1 \ ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \ ${RPSRC}/w100_core-r1.patch;patch=1 \ @@ -52,7 +51,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \ ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_base-r19.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_bl-r0.patch;patch=1 \ + ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \ ${RPSRC}/ipaq/pxa_keys-r1.patch;patch=1 \ ${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \ @@ -70,7 +69,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-udc-r3.patch;patch=1 \ ${DOSRC}/tosa-irda-r2.patch;patch=1 \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ - ${DOSRC}/tosa-bl-r4.patch;patch=1 \ + ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ diff --git a/packages/linux/nslu2-kernel/2.6.12/missing-exports.patch b/packages/linux/nslu2-kernel/2.6.12/missing-exports.patch new file mode 100644 index 0000000000..935dd29115 --- /dev/null +++ b/packages/linux/nslu2-kernel/2.6.12/missing-exports.patch @@ -0,0 +1,19 @@ +--- linux-2.6.12/drivers/char/random.c~ 2005-05-14 16:42:24.000000000 -0400 ++++ linux-2.6.12/drivers/char/random.c 2005-05-14 16:42:46.000000000 -0400 +@@ -646,6 +646,7 @@ extern void add_input_randomness(unsigne + add_timer_randomness(&input_timer_state, + (type << 4) ^ code ^ (code >> 4) ^ value); + } ++EXPORT_SYMBOL_GPL(add_input_randomness); + + void add_interrupt_randomness(int irq) + { +--- linux-2.6.12/lib/kobject_uevent.c~ 2005-05-14 16:45:13.000000000 -0400 ++++ linux-2.6.12/lib/kobject_uevent.c 2005-05-14 16:45:27.000000000 -0400 +@@ -178,6 +178,7 @@ static inline int send_uevent(const char + + #ifdef CONFIG_HOTPLUG + char hotplug_path[HOTPLUG_PATH_LEN] = "/sbin/hotplug"; ++EXPORT_SYMBOL_GPL(hotplug_path); + u64 hotplug_seqnum; + static DEFINE_SPINLOCK(sequence_lock); diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index d72015c29a..8b54cdc703 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r4" +PR = "r6" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include @@ -21,4 +21,5 @@ N2K_PATCHES = "\ file://xscale-reset.patch;patch=1 \ file://x1205-rtc.c-id.patch;patch=1 \ file://mtd-shutdown.patch;patch=1 \ + file://missing-exports.patch;patch=1 \ " diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index ba3744e2f5..fef846fe33 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -626,7 +626,7 @@ CONFIG_INPUT=m CONFIG_INPUT_MOUSEDEV=n # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set -# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set # @@ -929,7 +929,7 @@ CONFIG_USB_HIDDEV=y # # USB HID Boot Protocol drivers # -# CONFIG_USB_KBD is not set +CONFIG_USB_KBD=m # CONFIG_USB_MOUSE is not set # CONFIG_USB_AIPTEK is not set # CONFIG_USB_WACOM is not set diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb index 6ab8bc73b5..c8c231d302 100644 --- a/packages/meta/openslug-image.bb +++ b/packages/meta/openslug-image.bb @@ -36,8 +36,7 @@ inherit image_ipk python () { # Don't build openslug images unless we're targeting an nslu2 mach = bb.data.getVar("MACHINE", d, 1) - dist = bb.data.getVar("DISTRO", d, 1) - if mach != 'nslu2' or dist != 'openslug': + if mach != 'nslu2': raise bb.parse.SkipPackage("OpenSlug only builds for the Linksys NSLU2") } LICENSE = MIT diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb index a3bd0a830a..bb5a68d01e 100644 --- a/packages/meta/openslug-native.bb +++ b/packages/meta/openslug-native.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Packages that are required for the OpenSlug native build environment" LICENSE = MIT -PR = "r5" +PR = "r7" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 @@ -21,6 +21,7 @@ OPENSLUG_NATIVE = "\ gcc gcc-symlinks \ glibc-extra-nss glibc-utils \ gnu-config \ + gzip \ libc6 libc6-dev \ libg2c-dev \ libgdbm3 \ @@ -34,6 +35,7 @@ OPENSLUG_NATIVE = "\ monotone-5 \ ncurses ncurses-dev ncurses-terminfo \ patch \ + perl perl-modules \ python-core python-io python-lang python-pickle python-shell python-textutils \ sed \ tar \ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 96d81e1d31..07dc1d0080 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -34,6 +34,7 @@ OPENSLUG_DEVELOPMENT = "\ pciutils \ quilt \ sed \ + strace \ util-linux \ " @@ -53,6 +54,7 @@ OPENSLUG_PACKAGES = "\ coreutils \ cron \ cvs\ + cyrus-imapd \ dnsmasq \ expat \ ftpd-topfield \ @@ -62,14 +64,13 @@ OPENSLUG_PACKAGES = "\ less \ libusb \ libxml2 \ - man \ - man-pages \ miau \ microcom \ mt-daapd \ mutt \ mysql \ nail \ + nano \ ncftp \ obexftp openobex openobex-apps ircp \ openssh \ @@ -77,13 +78,10 @@ OPENSLUG_PACKAGES = "\ pcre \ ppp \ procps \ - psmisc \ puppy \ pwc \ rsync \ - screen \ setpwc \ - streamripper \ sudo \ sysfsutils \ thttpd \ @@ -95,6 +93,7 @@ OPENSLUG_PACKAGES = "\ python \ samba \ sane-backends \ + strace \ thttpd \ vlan \ wget \ @@ -107,18 +106,22 @@ OPENSLUG_PACKAGES = "\ # such as sinf.) OPENSLUG_PACKAGES_append_linux = "\ bind \ + man man-pages \ mgetty \ mpd \ nfs-utils \ libpam \ php \ postfix \ + psmisc \ + screen \ + streamripper \ + timezones \ xinetd \ yp-tools ypbind ypserv \ " BROKEN_PACKAGES = "\ - strace \ " DEPENDS = 'openslug-image \ diff --git a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb index 8042a9789c..8a4fd421e7 100644 --- a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb +++ b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "unknown" -SRC_URI = "http://www.red-bean.com/~proski/firmware/1.7.4.tar.gz" +SRC_URI = "http://www.red-bean.com/~proski/firmware/${PV}.tar.bz2" INHIBIT_PACKAGE_STRIP = "1" diff --git a/packages/nis/pwdutils_2.6.bb b/packages/nis/pwdutils_2.6.bb index 4ba89ffb23..4db798c151 100644 --- a/packages/nis/pwdutils_2.6.bb +++ b/packages/nis/pwdutils_2.6.bb @@ -12,6 +12,8 @@ HOMEPAGE="http://lists.suse.com/archive/pwdutils/" include nis.inc +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" + # an selinux API is used even if no selinux is detected by # configure. SRC_URI += " file://no-selinux.patch;patch=1" diff --git a/packages/nis/ypbind-mt_1.18.bb b/packages/nis/ypbind-mt_1.18.bb index e58daa6670..fb6b0b3621 100644 --- a/packages/nis/ypbind-mt_1.18.bb +++ b/packages/nis/ypbind-mt_1.18.bb @@ -16,6 +16,8 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html" include nis.inc +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" + # ypbind-mt now provides all the functionality of ypbind # and is used in place of it. PROVIDES += "ypbind" diff --git a/packages/nis/ypserv_2.17.bb b/packages/nis/ypserv_2.17.bb index 6edb534e8f..c6c564bd50 100644 --- a/packages/nis/ypserv_2.17.bb +++ b/packages/nis/ypserv_2.17.bb @@ -7,6 +7,8 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypserv/index.html" include nis.inc +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" + # ypserv needs a database package, gdbm is currently the # only candidate DEPENDS += " gdbm" diff --git a/packages/pam/libpam_0.79.bb b/packages/pam/libpam_0.79.bb index 8907d9762a..b2fb9deb8f 100644 --- a/packages/pam/libpam_0.79.bb +++ b/packages/pam/libpam_0.79.bb @@ -19,6 +19,7 @@ MAINTAINER = "John Bowler <jbowler@acm.org>" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL-2" +PR = "r1" # The project is actually called Linux-PAM but that gives # a bad OE package name because of the upper case characters @@ -37,6 +38,14 @@ SRC_URI += " file://libpam-make.patch;patch=1" inherit autotools # EXTRA_OECONF += " --enable-static-libpam" +# Disable building of the documentation - it requires too many different +# programs installed on the build system and is a waste of time. This +# leaves the man documentation in the build. +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2TXT=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2HTML=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2LATEX=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_PS2PDF=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2PS=no" LEAD_SONAME = "libpam.so.*" diff --git a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch index ae162fbdc6..0181e37c95 100644 --- a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch +++ b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch @@ -17,21 +17,13 @@ perl='' perl_patchlevel='' perladmin='red@criticalintegration.com' - perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' +-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' ++perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc -lgcc_s' -perlpath='/usr/bin/perl' +perlpath='hostperl' pg='pg' phostname='hostname' pidtype='pid_t' -@@ -906,7 +907,7 @@ - srandom_r_proto='0' - src='.' - ssizetype='ssize_t' --startperl='#!/usr/bin/perl' -+startperl='#!hostperl' - startsh='#!/bin/sh' - static_ext=' ' - stdchar='char' @@ -971,6 +972,7 @@ usereentrant='undef' usesfio='false' diff --git a/packages/perl/perl-5.8.7/config.sh-armeb-linux b/packages/perl/perl-5.8.7/config.sh-armeb-linux index 3c5adaf70b..155b5237aa 100644 --- a/packages/perl/perl-5.8.7/config.sh-armeb-linux +++ b/packages/perl/perl-5.8.7/config.sh-armeb-linux @@ -907,7 +907,7 @@ srand48_r_proto='0' srandom_r_proto='0' src='.' ssizetype='ssize_t' -startperl='#!hostperl' +startperl='#!/usr/bin/perl' startsh='#!/bin/sh' static_ext=' ' stdchar='char' diff --git a/packages/perl/perl-5.8.7/config.sh-i686-linux b/packages/perl/perl-5.8.7/config.sh-i686-linux index b09b7140e7..313ff2fbb1 100644 --- a/packages/perl/perl-5.8.7/config.sh-i686-linux +++ b/packages/perl/perl-5.8.7/config.sh-i686-linux @@ -905,7 +905,7 @@ srand48_r_proto='0' srandom_r_proto='0' src='.' ssizetype='ssize_t' -startperl='#!hostperl' +startperl='#!/usr/bin/perl' startsh='#!/bin/sh' static_ext=' ' stdchar='char' diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index dc457b43ff..babeea3e9a 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -4,7 +4,7 @@ include perl.inc SRC_URI += "file://config.sh-armeb-linux" -PR = "r4" +PR = "r9" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl @@ -30,5 +30,12 @@ do_configure() { do_install_append() { ln -s libperl.so.${PV} ${D}/${libdir}/libperl.so.5 + sed -i -e "s,${D},,g" ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/Config_heavy.pl } +# Create a perl-modules package recommending all the other perl +# packages (actually the non modules packages and not created too) +ALLOW_EMPTY_perl-modules = 1 +PACKAGES_append = " perl-modules" +RRECOMMENDS_perl-modules = "${PACKAGES}" +RPROVIDES_perl-lib = "perl-lib" diff --git a/packages/unionfs/unionfs-1.0.9/.mtn2git_empty b/packages/pine/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/unionfs/unionfs-1.0.9/.mtn2git_empty +++ b/packages/pine/.mtn2git_empty diff --git a/packages/pine/pine_4.63.bb b/packages/pine/pine_4.63.bb new file mode 100644 index 0000000000..018c7dab94 --- /dev/null +++ b/packages/pine/pine_4.63.bb @@ -0,0 +1,59 @@ +DESCRIPTION = "Pine(R) - a Program for Internet News & Email" +SECTION = "console/network" +LICENSE = "Pine" +DEPENDS = "ncurses" +RDEPENDS_pine = "pico" +HOMEPAGE = "http://www.washington.edu/pine/" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" + +SRC_URI = "ftp://ftp.cac.washington.edu/pine/pine.tar.bz2" +S = "${WORKDIR}/pine${PV}" + +inherit autotools + +# +# ~lart Pine's build structure... +# +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "-e" +export MAKE = 'MAKE="make -e" make -e' + +CFLAGS += "-I${S}/imap/c-client" +LDFLAGS += "${S}/imap/c-client/c-client.a -lssl -lcrypt" + +export SSLDEFINES = "-DSSL_CERT_DIRECTORY=\\"/etc/ssl/certs\\" -DSSL_KEY_DIRECTORY=\\"/etc/ssl/private\\"" +export SSLCFLAGS = "${CFLAGS} -I${STAGING_INCDIR}/openssl ${SSLDEFINES}" +export SSLLDFLAGS = "-lssl -lcrypt ${LDFLAGS} -L${STAGING_LIBDIR}/openssl" +export EXTRALDFLAGS = "${LDFLAGS}" + +do_configure() { + ln -sf ${S}/imap/c-client ${S}/c-client + cd ${S}/pico/osdep && \ + ${BUILD_CC} -o includer includer.c + cd ${S}/pine/osdep && \ + ${BUILD_CC} -o includer includer.c +} + +do_compile() { + unset CFLAGS && unset LDFLAGS + cd ${S}/imap && oe_runmake slx + + for i in pico pine + do + cd ${S}/$i && oe_runmake -f makefile.lnx + done +} + +BINARIES = "imap/mailutil/mailutil imap/mlock/mlock pico/pico pico/pilot pine/pine" + +do_install() { + install -d 0644 ${D}${bindir} + for binary in ${BINARIES} + do + install -m 0755 $binary ${D}${bindir} + done +} + +PACKAGES = "pico pine" +FILES_pico = "${bindir}/pico ${bindir}/pilot" + diff --git a/packages/portmap/portmap_5-9.bb b/packages/portmap/portmap_5-9.bb index 3092b70539..76d66e9ad9 100644 --- a/packages/portmap/portmap_5-9.bb +++ b/packages/portmap/portmap_5-9.bb @@ -1,7 +1,7 @@ DESCRIPTION = "RPC program number mapper." SECTION = "console/network" LICENSE = "GPL" -PR = "r3" +PR = "r5" SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ diff --git a/packages/prboom/files/prboom.sh b/packages/prboom/files/prboom.sh index 7e41d87fcb..636b17879d 100755 --- a/packages/prboom/files/prboom.sh +++ b/packages/prboom/files/prboom.sh @@ -9,6 +9,8 @@ case $model in *) par="";; esac +test -e /usr/share/games/doom/prboom.cfg && par="$par -config /usr/share/games/doom/prboom.cfg" + echo "Model: [$model]" echo "Launching prboom $par $*" diff --git a/packages/prboom/prboom-devconfig.bb b/packages/prboom/prboom-devconfig.bb new file mode 100644 index 0000000000..bcfcee14cd --- /dev/null +++ b/packages/prboom/prboom-devconfig.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Device specific configuration for prboom" +SECTION = "games" +PRIORITY = "optional" +MAINTAINER = "coredump@handhelds.org" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "file://prboom.cfg" + +S = "${WORKDIR}/${PN}" + +FILES_${PN} = "/usr/share/games/doom/prboom.cfg" + +do_install() { + install -d ${D}/usr/share/games/doom/ + + install -m 644 ${WORKDIR}/prboom.cfg ${D}/usr/share/games/doom/ +} diff --git a/packages/prboom/prboom-devconfig/.mtn2git_empty b/packages/prboom/prboom-devconfig/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/prboom/prboom-devconfig/.mtn2git_empty diff --git a/packages/prboom/prboom-devconfig/akita/.mtn2git_empty b/packages/prboom/prboom-devconfig/akita/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/prboom/prboom-devconfig/akita/.mtn2git_empty diff --git a/packages/prboom/prboom-devconfig/akita/prboom.cfg b/packages/prboom/prboom-devconfig/akita/prboom.cfg new file mode 100644 index 0000000000..cd17d0baff --- /dev/null +++ b/packages/prboom/prboom-devconfig/akita/prboom.cfg @@ -0,0 +1,313 @@ +# Doom config file +# Format: +# variable value + +# Misc settings +default_compatibility_level -1 +realtic_clock_rate 100 +max_player_corpse 32 +flashing_hom 0 +demo_insurance 2 +endoom_mode 0x5 +level_precache 0 + +# Files +wadfile_1 "prboom.wad" +wadfile_2 "" +dehfile_1 "" +dehfile_2 "" + +# Game settings +default_skill 2 +weapon_recoil 0 +doom_weapon_toggles 1 +player_bobbing 1 +monsters_remember 1 +monster_infighting 1 +monster_backing 0 +monster_avoid_hazards 1 +monkeys 0 +monster_friction 1 +help_friends 1 +player_helpers 0 +friend_distance 128 +dog_jumping 1 +sts_always_red 1 +sts_pct_always_gray 0 +sts_traditional_keys 0 +traditional_menu 1 +show_messages 1 +autorun 0 + +# Compatibility settings +comp_zombie 0 +comp_infcheat 0 +comp_stairs 0 +comp_telefrag 0 +comp_dropoff 0 +comp_falloff 0 +comp_staylift 0 +comp_doorstuck 0 +comp_pursuit 0 +comp_vile 0 +comp_pain 0 +comp_skull 0 +comp_blazing 0 +comp_doorlight 0 +comp_god 0 +comp_skymap 0 +comp_floors 0 +comp_model 0 +comp_zerotags 0 +comp_moveblock 0 +comp_sound 0 + +# Sound settings +sound_card -1 +music_card -1 +pitched_sounds 0 +samplerate 22050 +sfx_volume 8 +music_volume 8 +mus_pause_opt 2 +sounddev "/dev/dsp" +snd_channels 8 + +# Video settings +screen_width 540 +screen_height 380 +fake_contrast 1 +use_fullscreen 1 +use_doublebuffer 1 +translucency 1 +tran_filter_pct 66 +screenblocks 10 +usegamma 3 +X_options 0x0 + +# Mouse settings +use_mouse 1 +mouse_sensitivity_horiz 10 +mouse_sensitivity_vert 10 +mouseb_fire 0 +mouseb_strafe 1 +mouseb_forward 2 + +# Key bindings +key_right 0xae +key_left 0xac +key_up 0xad +key_down 0xaf +key_menu_right 0xae +key_menu_left 0xac +key_menu_up 0xad +key_menu_down 0xaf +key_menu_backspace 0x7f +key_menu_escape 0x1b +key_menu_enter 0x10d +key_strafeleft 0x2c +key_straferight 0x2e +key_fire 0x10d +key_use 0x20 +key_strafe 0xb8 +key_speed 0xb6 +key_savegame 0xbc +key_loadgame 0xbd +key_soundvolume 0xbe +key_hud 0xbf +key_quicksave 0xc0 +key_endgame 0xc1 +key_messages 0xc2 +key_quickload 0xc3 +key_quit 0xc4 +key_gamma 0xd7 +key_spy 0xd8 +key_pause 0xff +key_autorun 0xba +key_chat 0x74 +key_backspace 0x7f +key_enter 0xd +key_map 0x9 +key_map_right 0xae +key_map_left 0xac +key_map_up 0xad +key_map_down 0xaf +key_map_zoomin 0x3d +key_map_zoomout 0x2d +key_map_gobig 0x30 +key_map_follow 0x66 +key_map_mark 0x6d +key_map_clear 0x63 +key_map_grid 0x67 +key_map_rotate 0x72 +key_map_overlay 0x6f +key_reverse 0x2f +key_zoomin 0x3d +key_zoomout 0x2d +key_chatplayer1 0x67 +key_chatplayer2 0x69 +key_chatplayer3 0x62 +key_chatplayer4 0x72 +key_weapontoggle 0x30 +key_weapon1 0x31 +key_weapon2 0x32 +key_weapon3 0x33 +key_weapon4 0x34 +key_weapon5 0x35 +key_weapon6 0x36 +key_weapon7 0x37 +key_weapon8 0x38 +key_weapon9 0x39 +key_screenshot 0x2a + +# Joystick settings +use_joystick 0 +joy_left 0 +joy_right 0 +joy_up 0 +joy_down 0 +joyb_fire 0 +joyb_strafe 1 +joyb_speed 2 +joyb_use 3 + +# Chat macros +chatmacro0 "No" +chatmacro1 "I'm ready to kick butt!" +chatmacro2 "I'm OK." +chatmacro3 "I'm not looking too good!" +chatmacro4 "Help!" +chatmacro5 "You suck!" +chatmacro6 "Next time, scumbag..." +chatmacro7 "Come here!" +chatmacro8 "I'll take care of it." +chatmacro9 "Yes" + +# Automap settings +mapcolor_back 0xf7 +mapcolor_grid 0x68 +mapcolor_wall 0x17 +mapcolor_fchg 0x37 +mapcolor_cchg 0xd7 +mapcolor_clsd 0xd0 +mapcolor_rkey 0xaf +mapcolor_bkey 0xcc +mapcolor_ykey 0xe7 +mapcolor_rdor 0xaf +mapcolor_bdor 0xcc +mapcolor_ydor 0xe7 +mapcolor_tele 0x77 +mapcolor_secr 0xfc +mapcolor_exit 0x0 +mapcolor_unsn 0x68 +mapcolor_flat 0x58 +mapcolor_sprt 0x70 +mapcolor_item 0xe7 +mapcolor_hair 0xd0 +mapcolor_sngl 0xd0 +mapcolor_me 0x70 +mapcolor_frnd 0x70 +map_secret_after 0 +map_point_coord 0 +automapmode 0x0 + +# Heads-up display settings +hudcolor_titl 5 +hudcolor_xyco 3 +hudcolor_mesg 6 +hudcolor_chat 5 +hudcolor_list 5 +hud_msg_lines 1 +hud_list_bgon 0 +hud_distributed 0 +health_red 25 +health_yellow 50 +health_green 100 +armor_red 25 +armor_yellow 50 +armor_green 100 +ammo_red 25 +ammo_yellow 50 +hud_active 2 +hud_displayed 0 +hud_nosecrets 0 + +# Weapon preferences +weapon_choice_1 6 +weapon_choice_2 9 +weapon_choice_3 4 +weapon_choice_4 3 +weapon_choice_5 2 +weapon_choice_6 8 +weapon_choice_7 5 +weapon_choice_8 7 +weapon_choice_9 1 + +# Music +mus_e1m1 "e1m1.mp3" +mus_e1m2 "e1m2.mp3" +mus_e1m3 "e1m3.mp3" +mus_e1m4 "e1m4.mp3" +mus_e1m5 "e1m5.mp3" +mus_e1m6 "e1m6.mp3" +mus_e1m7 "e1m7.mp3" +mus_e1m8 "e1m8.mp3" +mus_e1m9 "e1m9.mp3" +mus_e2m1 "e2m1.mp3" +mus_e2m2 "e2m2.mp3" +mus_e2m3 "e2m3.mp3" +mus_e2m4 "e2m4.mp3" +mus_e2m5 "e1m7.mp3" +mus_e2m6 "e2m6.mp3" +mus_e2m7 "e2m7.mp3" +mus_e2m8 "e2m8.mp3" +mus_e2m9 "e3m1.mp3" +mus_e3m1 "e3m1.mp3" +mus_e3m2 "e3m2.mp3" +mus_e3m3 "e3m3.mp3" +mus_e3m4 "e1m8.mp3" +mus_e3m5 "e1m7.mp3" +mus_e3m6 "e1m6.mp3" +mus_e3m7 "e2m7.mp3" +mus_e3m8 "e3m8.mp3" +mus_e3m9 "e1m9.mp3" +mus_inter "e2m3.mp3" +mus_intro "intro.mp3" +mus_bunny "bunny.mp3" +mus_victor "victor.mp3" +mus_introa "intro.mp3" +mus_runnin "runnin.mp3" +mus_stalks "stalks.mp3" +mus_countd "countd.mp3" +mus_betwee "betwee.mp3" +mus_doom "doom.mp3" +mus_the_da "the_da.mp3" +mus_shawn "shawn.mp3" +mus_ddtblu "ddtblu.mp3" +mus_in_cit "in_cit.mp3" +mus_dead "dead.mp3" +mus_stlks2 "stalks.mp3" +mus_theda2 "the_da.mp3" +mus_doom2 "doom.mp3" +mus_ddtbl2 "ddtblu.mp3" +mus_runni2 "runnin.mp3" +mus_dead2 "dead.mp3" +mus_stlks3 "stalks.mp3" +mus_romero "romero.mp3" +mus_shawn2 "shawn.mp3" +mus_messag "messag.mp3" +mus_count2 "countd.mp3" +mus_ddtbl3 "ddtblu.mp3" +mus_ampie "ampie.mp3" +mus_theda3 "the_da.mp3" +mus_adrian "adrian.mp3" +mus_messg2 "messag.mp3" +mus_romer2 "romero.mp3" +mus_tense "tense.mp3" +mus_shawn3 "shawn.mp3" +mus_openin "openin.mp3" +mus_evil "evil.mp3" +mus_ultima "ultima.mp3" +mus_read_m "read_m.mp3" +mus_dm2ttl "dm2ttl.mp3" +mus_dm2int "dm2int.mp3" diff --git a/packages/prboom/prboom-devconfig/collie/.mtn2git_empty b/packages/prboom/prboom-devconfig/collie/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/prboom/prboom-devconfig/collie/.mtn2git_empty diff --git a/packages/prboom/prboom-devconfig/collie/prboom.cfg b/packages/prboom/prboom-devconfig/collie/prboom.cfg new file mode 100644 index 0000000000..67703acf8c --- /dev/null +++ b/packages/prboom/prboom-devconfig/collie/prboom.cfg @@ -0,0 +1,313 @@ +# Doom config file +# Format: +# variable value + +# Misc settings +default_compatibility_level -1 +realtic_clock_rate 100 +max_player_corpse 32 +flashing_hom 0 +demo_insurance 2 +endoom_mode 0x5 +level_precache 0 + +# Files +wadfile_1 "prboom.wad" +wadfile_2 "" +dehfile_1 "" +dehfile_2 "" + +# Game settings +default_skill 3 +weapon_recoil 1 +doom_weapon_toggles 1 +player_bobbing 1 +monsters_remember 1 +monster_infighting 1 +monster_backing 1 +monster_avoid_hazards 1 +monkeys 1 +monster_friction 1 +help_friends 1 +player_helpers 0 +friend_distance 128 +dog_jumping 1 +sts_always_red 0 +sts_pct_always_gray 1 +sts_traditional_keys 0 +traditional_menu 0 +show_messages 1 +autorun 1 + +# Compatibility settings +comp_zombie 0 +comp_infcheat 0 +comp_stairs 0 +comp_telefrag 1 +comp_dropoff 0 +comp_falloff 0 +comp_staylift 0 +comp_doorstuck 0 +comp_pursuit 0 +comp_vile 0 +comp_pain 0 +comp_skull 0 +comp_blazing 0 +comp_doorlight 0 +comp_god 0 +comp_skymap 0 +comp_floors 0 +comp_model 0 +comp_zerotags 0 +comp_moveblock 0 +comp_sound 0 + +# Sound settings +sound_card -1 +music_card -1 +pitched_sounds 0 +samplerate 22050 +sfx_volume 8 +music_volume 8 +mus_pause_opt 2 +sounddev "/dev/dsp" +snd_channels 8 + +# Video settings +screen_width 320 +screen_height 240 +fake_contrast 1 +use_fullscreen 1 +use_doublebuffer 1 +translucency 1 +tran_filter_pct 66 +screenblocks 10 +usegamma 4 +X_options 0x0 + +# Mouse settings +use_mouse 1 +mouse_sensitivity_horiz 10 +mouse_sensitivity_vert 10 +mouseb_fire 0 +mouseb_strafe 1 +mouseb_forward 2 + +# Key bindings +key_right 0xae +key_left 0xac +key_up 0xad +key_down 0xaf +key_menu_right 0xae +key_menu_left 0xac +key_menu_up 0xad +key_menu_down 0xaf +key_menu_backspace 0x7f +key_menu_escape 0x1b +key_menu_enter 0x20 +key_strafeleft 0x2c +key_straferight 0x2e +key_fire 0x20 +key_use 0xc3 +key_strafe 0xb8 +key_speed 0xb6 +key_savegame 0xbc +key_loadgame 0xbd +key_soundvolume 0xbe +key_hud 0xbf +key_quicksave 0xc0 +key_endgame 0xc1 +key_messages 0xc2 +key_quickload 0xd +key_quit 0xc4 +key_gamma 0xd7 +key_spy 0xd8 +key_pause 0xff +key_autorun 0xba +key_chat 0x74 +key_backspace 0x7f +key_enter 0xd +key_map 0x126 +key_map_right 0xad +key_map_left 0xaf +key_map_up 0xac +key_map_down 0xae +key_map_zoomin 0x3d +key_map_zoomout 0x2d +key_map_gobig 0x30 +key_map_follow 0x66 +key_map_mark 0x6d +key_map_clear 0x63 +key_map_grid 0x67 +key_map_rotate 0x72 +key_map_overlay 0x6f +key_reverse 0x2f +key_zoomin 0x3d +key_zoomout 0x2d +key_chatplayer1 0x67 +key_chatplayer2 0x69 +key_chatplayer3 0x62 +key_chatplayer4 0x72 +key_weapontoggle 0x30 +key_weapon1 0x31 +key_weapon2 0x32 +key_weapon3 0x33 +key_weapon4 0x34 +key_weapon5 0x35 +key_weapon6 0x36 +key_weapon7 0x37 +key_weapon8 0x38 +key_weapon9 0x39 +key_screenshot 0x2a + +# Joystick settings +use_joystick 0 +joy_left 0 +joy_right 0 +joy_up 0 +joy_down 0 +joyb_fire 0 +joyb_strafe 1 +joyb_speed 2 +joyb_use 3 + +# Chat macros +chatmacro0 "No" +chatmacro1 "I'm ready to kick butt!" +chatmacro2 "I'm OK." +chatmacro3 "I'm not looking too good!" +chatmacro4 "Help!" +chatmacro5 "You suck!" +chatmacro6 "Next time, scumbag..." +chatmacro7 "Come here!" +chatmacro8 "I'll take care of it." +chatmacro9 "Yes" + +# Automap settings +mapcolor_back 0xf7 +mapcolor_grid 0x68 +mapcolor_wall 0x17 +mapcolor_fchg 0x37 +mapcolor_cchg 0xd7 +mapcolor_clsd 0xd0 +mapcolor_rkey 0xaf +mapcolor_bkey 0xcc +mapcolor_ykey 0xe7 +mapcolor_rdor 0xaf +mapcolor_bdor 0xcc +mapcolor_ydor 0xe7 +mapcolor_tele 0x77 +mapcolor_secr 0xfc +mapcolor_exit 0x0 +mapcolor_unsn 0x68 +mapcolor_flat 0x58 +mapcolor_sprt 0x70 +mapcolor_item 0xe7 +mapcolor_hair 0xd0 +mapcolor_sngl 0xd0 +mapcolor_me 0x70 +mapcolor_frnd 0x70 +map_secret_after 0 +map_point_coord 0 +automapmode 0x0 + +# Heads-up display settings +hudcolor_titl 5 +hudcolor_xyco 3 +hudcolor_mesg 6 +hudcolor_chat 5 +hudcolor_list 5 +hud_msg_lines 1 +hud_list_bgon 0 +hud_distributed 0 +health_red 25 +health_yellow 50 +health_green 100 +armor_red 25 +armor_yellow 50 +armor_green 100 +ammo_red 25 +ammo_yellow 50 +hud_active 2 +hud_displayed 0 +hud_nosecrets 0 + +# Weapon preferences +weapon_choice_1 6 +weapon_choice_2 9 +weapon_choice_3 4 +weapon_choice_4 3 +weapon_choice_5 2 +weapon_choice_6 8 +weapon_choice_7 5 +weapon_choice_8 7 +weapon_choice_9 1 + +# Music +mus_e1m1 "e1m1.mp3" +mus_e1m2 "e1m2.mp3" +mus_e1m3 "e1m3.mp3" +mus_e1m4 "e1m4.mp3" +mus_e1m5 "e1m5.mp3" +mus_e1m6 "e1m6.mp3" +mus_e1m7 "e1m7.mp3" +mus_e1m8 "e1m8.mp3" +mus_e1m9 "e1m9.mp3" +mus_e2m1 "e2m1.mp3" +mus_e2m2 "e2m2.mp3" +mus_e2m3 "e2m3.mp3" +mus_e2m4 "e2m4.mp3" +mus_e2m5 "e1m7.mp3" +mus_e2m6 "e2m6.mp3" +mus_e2m7 "e2m7.mp3" +mus_e2m8 "e2m8.mp3" +mus_e2m9 "e3m1.mp3" +mus_e3m1 "e3m1.mp3" +mus_e3m2 "e3m2.mp3" +mus_e3m3 "e3m3.mp3" +mus_e3m4 "e1m8.mp3" +mus_e3m5 "e1m7.mp3" +mus_e3m6 "e1m6.mp3" +mus_e3m7 "e2m7.mp3" +mus_e3m8 "e3m8.mp3" +mus_e3m9 "e1m9.mp3" +mus_inter "e2m3.mp3" +mus_intro "intro.mp3" +mus_bunny "bunny.mp3" +mus_victor "victor.mp3" +mus_introa "intro.mp3" +mus_runnin "runnin.mp3" +mus_stalks "stalks.mp3" +mus_countd "countd.mp3" +mus_betwee "betwee.mp3" +mus_doom "doom.mp3" +mus_the_da "the_da.mp3" +mus_shawn "shawn.mp3" +mus_ddtblu "ddtblu.mp3" +mus_in_cit "in_cit.mp3" +mus_dead "dead.mp3" +mus_stlks2 "stalks.mp3" +mus_theda2 "the_da.mp3" +mus_doom2 "doom.mp3" +mus_ddtbl2 "ddtblu.mp3" +mus_runni2 "runnin.mp3" +mus_dead2 "dead.mp3" +mus_stlks3 "stalks.mp3" +mus_romero "romero.mp3" +mus_shawn2 "shawn.mp3" +mus_messag "messag.mp3" +mus_count2 "countd.mp3" +mus_ddtbl3 "ddtblu.mp3" +mus_ampie "ampie.mp3" +mus_theda3 "the_da.mp3" +mus_adrian "adrian.mp3" +mus_messg2 "messag.mp3" +mus_romer2 "romero.mp3" +mus_tense "tense.mp3" +mus_shawn3 "shawn.mp3" +mus_openin "openin.mp3" +mus_evil "evil.mp3" +mus_ultima "ultima.mp3" +mus_read_m "read_m.mp3" +mus_dm2ttl "dm2ttl.mp3" +mus_dm2int "dm2int.mp3" diff --git a/packages/prboom/prboom-devconfig/prboom.cfg b/packages/prboom/prboom-devconfig/prboom.cfg new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/prboom/prboom-devconfig/prboom.cfg @@ -0,0 +1 @@ + diff --git a/packages/prboom/prboom-opie_2.2.6.bb b/packages/prboom/prboom-opie_2.2.6.bb index 1ab4227619..098bd028cb 100644 --- a/packages/prboom/prboom-opie_2.2.6.bb +++ b/packages/prboom/prboom-opie_2.2.6.bb @@ -1,6 +1,6 @@ include prboom_${PV}.bb -PR = "r5" +PR = "r6" S = "${WORKDIR}/prboom-${PV}" diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol index c170e4abdc..068d964726 100755 --- a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol +++ b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol @@ -27,7 +27,7 @@ vecho() { # import FS mount options from fstab or use defaults # if detection fails -SD_OPTS="`grep "$MOUNT_POINT" /etc/fstab | awk '{print $4}'`" +SD_OPTS="`grep "$MOUNT_POINT" /etc/fstab | head -1 | awk '{print $4}'`" if test -z "$SD_OPTS" then SD_OPTS="noatime,sync" @@ -130,14 +130,14 @@ case "$ACTION" in vecho "Beginning SD auto-mount..:" - ps ax > "$LOGFILE-ps" + test "$ENABLE_LOG" = yes && ps ax > "$LOGFILE-ps" # Read available partitions from /proc/partitions. OK_PARTS=` head -20 /proc/partitions |grep mmcda | sort| uniq | awk '{print $4}'` decho "OK_PARTS [$OK_PARTS]" - echo $OK_PARTS > "$LOGFILE-part" + test "$ENABLE_LOG" = yes && echo $OK_PARTS > "$LOGFILE-part" if test "`echo "$OK_PARTS" | wc -l | awk '{print $1}`" -gt 1 then diff --git a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb index 08dd26de23..d27f018daf 100644 --- a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb +++ b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "CLOSED" RDEPENDS = "kernel (${KERNEL_VERSION})" -PR = "r19" +PR = "r20" SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r3.tar.bz2 \ file://sd \ diff --git a/packages/unionfs/unionfs-1.0.13/.mtn2git_empty b/packages/unionfs/unionfs-1.0.13/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/unionfs/unionfs-1.0.13/.mtn2git_empty diff --git a/packages/unionfs/unionfs-1.0.13/make.patch b/packages/unionfs/unionfs-1.0.13/make.patch new file mode 100644 index 0000000000..e2ab28b429 --- /dev/null +++ b/packages/unionfs/unionfs-1.0.13/make.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- unionfs-1.0.13/Makefile~make ++++ unionfs-1.0.13/Makefile +@@ -59,7 +59,7 @@ + unionfs2.4: ${obj-m} + + ${obj-m}: ${unionfs-objs} +- ld -o ${obj-m} -r ${unionfs-objs} ++ ${CC} -o ${obj-m} -r ${unionfs-objs} + + unionctl: unionctl.c usercommon.c + ${CC} -o $@ $^ ${UCFLAGS} diff --git a/packages/unionfs/unionfs-1.0.7/make.patch b/packages/unionfs/unionfs-1.0.7/make.patch deleted file mode 100644 index 583947e82f..0000000000 --- a/packages/unionfs/unionfs-1.0.7/make.patch +++ /dev/null @@ -1,98 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- unionfs-1.0.7/Makefile~make.patch -+++ unionfs-1.0.7/Makefile -@@ -3,10 +3,20 @@ - # - - # this should point to where your kernel headers are --LINUXSRC = /lib/modules/`uname -r`/build -+KERNELVER := $(shell uname -r) -+KERNELMAJVER := $(shell echo ${KERNELVER} | cut -d. -f1,2) -+LINUXSRC = /lib/modules/${KERNELVER}/build - TOPINC = -I${LINUXSRC}/include -+ - # This is where the make install target will put stuff --PREFIX = /usr/local -+DESTDIR = -+prefix = /usr/local -+sbindir = ${prefix}/sbin -+mandir = ${prefix}/man -+man4dir = ${mandir}/man4 -+man8dir = ${mandir}/man8 -+moduledir = /lib/modules/${KERNELVER} -+ - VERSION = 1.0.7 - TAROPTS = czvf - -@@ -22,8 +32,8 @@ - endif - - CC = gcc --KERNELVERSION=$(shell uname -r | cut -d. -f1,2) --ifeq ($(KERNELVERSION),2.4) -+LD = ld -+ifeq (${KERNELMAJVER},2.4) - CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Wno-unused-label -Werror -g ${EXTRACFLAGS} -O2 - endif - EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Werror -g ${EXTRACFLAGS} -O2 -@@ -35,7 +45,7 @@ - - BINS := unionctl uniondbg - --all: readthereadme unionfs$(KERNELVERSION) -+all: readthereadme unionfs$(KERNELMAJVER) - - readthereadme: - @echo "******************************************************************************" -@@ -43,13 +53,15 @@ - @echo "******************************************************************************" - @echo "" - --unionfs2.6: ${BINS} -+unionfs2.6: unionfs.ko ${BINS} -+ -+unionfs.ko: - make -C ${LINUXSRC} SUBDIRS=$(PWD) FISTDEVMK=$(PWD)/fistdev.mk modules - - unionfs2.4: ${obj-m} ${BINS} - - ${obj-m}: ${unionfs-objs} -- ld -o ${obj-m} -r ${unionfs-objs} -+ ${LD} -o ${obj-m} -r ${unionfs-objs} - - unionctl: unionctl.c - ${CC} -o $@ $? ${UCFLAGS} -@@ -74,15 +86,20 @@ - ${unionfs-objs}: unionfs.h fist.h - - install: all -- mkdir -p ${PREFIX}/sbin -- cp unionctl ${PREFIX}/sbin -- cp uniondbg ${PREFIX}/sbin -- mkdir -p ${PREFIX}/man/man4 -- mkdir -p ${PREFIX}/man/man8 -- cp man/unionfs.4 ${PREFIX}/man/man4 -- cp man/unionctl.8 ${PREFIX}/man/man8 -- cp man/uniondbg.8 ${PREFIX}/man/man8 -- if [ -f unionfs.ko ] ; then cp unionfs.ko /lib/modules/`uname -r`/kernel/fs ; else cp unionfs.o /lib/modules/`uname -r`/kernel/fs ; fi -+ mkdir -p ${DESTDIR}${sbindir} -+ cp unionctl ${DESTDIR}${sbindir} -+ cp uniondbg ${DESTDIR}${sbindir} -+ mkdir -p ${DESTDIR}${man4dir} -+ mkdir -p ${DESTDIR}${man8dir} -+ cp man/unionfs.4 ${DESTDIR}${man4dir} -+ cp man/unionctl.8 ${DESTDIR}${man8dir} -+ cp man/uniondbg.8 ${DESTDIR}${man8dir} -+ mkdir -p ${DESTDIR}${moduledir}/kernel/fs -+ifeq (${KERNELMAJVER},2.4) -+ cp unionfs.o ${DESTDIR}${moduledir}/kernel/fs -+else -+ cp unionfs.ko ${DESTDIR}${moduledir}/kernel/fs -+endif - - - release: unionfs-${VERSION}.tar.gz diff --git a/packages/unionfs/unionfs-1.0.8/make.patch b/packages/unionfs/unionfs-1.0.8/make.patch deleted file mode 100644 index ab77b527d5..0000000000 --- a/packages/unionfs/unionfs-1.0.8/make.patch +++ /dev/null @@ -1,100 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: unionfs-1.0.8/Makefile -=================================================================== ---- unionfs-1.0.8.orig/Makefile 2005-01-19 10:03:24.000000000 -0500 -+++ unionfs-1.0.8/Makefile 2005-01-19 11:30:15.372348104 -0500 -@@ -3,10 +3,20 @@ - # - - # this should point to where your kernel headers are --LINUXSRC = /lib/modules/`uname -r`/build -+KERNELVER := $(shell uname -r) -+KERNELMAJVER := $(shell echo ${KERNELVER} | cut -d. -f1,2) -+LINUXSRC = /lib/modules/${KERNELVER}/build - TOPINC = -I${LINUXSRC}/include -+ - # This is where the make install target will put stuff --PREFIX = /usr/local -+DESTDIR = -+prefix = /usr/local -+sbindir = ${prefix}/sbin -+mandir = ${prefix}/man -+man4dir = ${mandir}/man4 -+man8dir = ${mandir}/man8 -+moduledir = /lib/modules/${KERNELVER} -+ - VERSION = 1.0.8 - TAROPTS = czvf - UNIONFS_DEBUG_CFLAG = -g -@@ -24,8 +34,8 @@ - endif - - CC = gcc --KERNELVERSION=$(shell uname -r | cut -d. -f1,2) --ifeq ($(KERNELVERSION),2.4) -+LD = ld -+ifeq (${KERNELMAJVER},2.4) - CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Wno-unused-label -Werror ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG} - endif - EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Werror ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG} -@@ -37,7 +47,7 @@ - - BINS := unionctl uniondbg - --all: readthereadme unionfs$(KERNELVERSION) -+all: readthereadme unionfs$(KERNELMAJVER) - - readthereadme: - @echo "******************************************************************************" -@@ -45,13 +55,15 @@ - @echo "******************************************************************************" - @echo "" - --unionfs2.6: ${BINS} -+unionfs2.6: unionfs.ko ${BINS} -+ -+unionfs.ko: - make -C ${LINUXSRC} SUBDIRS=$(PWD) FISTDEVMK=$(PWD)/fistdev.mk modules - - unionfs2.4: ${obj-m} ${BINS} - - ${obj-m}: ${unionfs-objs} -- ld -o ${obj-m} -r ${unionfs-objs} -+ ${LD} -o ${obj-m} -r ${unionfs-objs} - - unionctl: unionctl.c - ${CC} -o $@ $? ${UCFLAGS} -@@ -76,15 +88,20 @@ - ${unionfs-objs}: unionfs.h fist.h - - install: all -- mkdir -p ${PREFIX}/sbin -- cp unionctl ${PREFIX}/sbin -- cp uniondbg ${PREFIX}/sbin -- mkdir -p ${PREFIX}/man/man4 -- mkdir -p ${PREFIX}/man/man8 -- cp man/unionfs.4 ${PREFIX}/man/man4 -- cp man/unionctl.8 ${PREFIX}/man/man8 -- cp man/uniondbg.8 ${PREFIX}/man/man8 -- if [ -f unionfs.ko ] ; then cp unionfs.ko /lib/modules/`uname -r`/kernel/fs ; else cp unionfs.o /lib/modules/`uname -r`/kernel/fs ; fi -+ mkdir -p ${DESTDIR}${sbindir} -+ cp unionctl ${DESTDIR}${sbindir} -+ cp uniondbg ${DESTDIR}${sbindir} -+ mkdir -p ${DESTDIR}${man4dir} -+ mkdir -p ${DESTDIR}${man8dir} -+ cp man/unionfs.4 ${DESTDIR}${man4dir} -+ cp man/unionctl.8 ${DESTDIR}${man8dir} -+ cp man/uniondbg.8 ${DESTDIR}${man8dir} -+ mkdir -p ${DESTDIR}${moduledir}/kernel/fs -+ifeq (${KERNELMAJVER},2.4) -+ cp unionfs.o ${DESTDIR}${moduledir}/kernel/fs -+else -+ cp unionfs.ko ${DESTDIR}${moduledir}/kernel/fs -+endif - - - release: unionfs-${VERSION}.tar.gz diff --git a/packages/unionfs/unionfs-1.0.9/make.patch b/packages/unionfs/unionfs-1.0.9/make.patch deleted file mode 100644 index 573ae55a43..0000000000 --- a/packages/unionfs/unionfs-1.0.9/make.patch +++ /dev/null @@ -1,118 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: unionfs-1.0.9/Makefile -=================================================================== ---- unionfs-1.0.9.orig/Makefile 2005-02-20 16:27:43.000000000 -0600 -+++ unionfs-1.0.9/Makefile 2005-02-20 16:31:36.000000000 -0600 -@@ -3,11 +3,19 @@ - # - - # this should point to where your kernel headers are --LINUXSRC = /lib/modules/`uname -r`/build -+KERNELVER := $(shell uname -r) -+KERNELMAJVER := $(shell echo ${KERNELVER} | cut -d. -f1,2) -+LINUXSRC = /lib/modules/${KERNELVER}/build - TOPINC = -I${LINUXSRC}/include - # This is where the make install target will put stuff --PREFIX = /usr/local --MODPREFIX= -+DESTDIR = -+prefix = /usr/local -+sbindir = ${prefix}/sbin -+mandir = ${prefix}/man -+man4dir = ${mandir}/man4 -+man8dir = ${mandir}/man8 -+moduledir = /lib/modules/${KERNELVER} -+ - VERSION = 1.0.9 - TAROPTS = czvf - UNIONFS_DEBUG_CFLAG = -g -@@ -25,8 +33,8 @@ - endif - - CC = gcc --KERNELVERSION=$(shell uname -r | cut -d. -f1,2) --ifeq ($(KERNELVERSION),2.4) -+LD = ld -+ifeq (${KERNELMAJVER},2.4) - CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Wno-unused-label -Werror -fno-strict-aliasing ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG} - endif - EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Werror -fno-strict-aliasing ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG} -@@ -39,7 +47,7 @@ - - BINS := unionctl uniondbg - --all: readthereadme unionfs$(KERNELVERSION) -+all: readthereadme unionfs$(KERNELMAJVER) - - readthereadme: - @echo "******************************************************************************" -@@ -47,13 +55,15 @@ - @echo "******************************************************************************" - @echo "" - --unionfs2.6: ${BINS} -+unionfs2.6: unionfs.ko ${BINS} -+ -+unionfs.ko: - make -C ${LINUXSRC} SUBDIRS=$(PWD) FISTDEVMK=$(PWD)/fistdev.mk modules - - unionfs2.4: ${obj-m} ${BINS} - - ${obj-m}: ${unionfs-objs} -- ld -o ${obj-m} -r ${unionfs-objs} -+ ${LD} -o ${obj-m} -r ${unionfs-objs} - - unionctl: unionctl.c - ${CC} -o $@ $? ${UCFLAGS} -@@ -78,23 +88,32 @@ - ${unionfs-objs}: unionfs.h fist.h - - install: all -- mkdir -p ${PREFIX}/sbin -- cp unionctl ${PREFIX}/sbin -- cp uniondbg ${PREFIX}/sbin -- mkdir -p ${PREFIX}/man/man4 -- mkdir -p ${PREFIX}/man/man8 -- cp man/unionfs.4 ${PREFIX}/man/man4 -- cp man/unionctl.8 ${PREFIX}/man/man8 -- cp man/uniondbg.8 ${PREFIX}/man/man8 -- if [ -f unionfs.ko ] ; then cp unionfs.ko ${MODPREFIX}/lib/modules/`uname -r`/kernel/fs ; else cp unionfs.o ${MODPREFIX}/lib/modules/`uname -r`/kernel/fs ; fi -+ mkdir -p ${DESTDIR}${sbindir} -+ cp unionctl ${DESTDIR}${sbindir} -+ cp uniondbg ${DESTDIR}${sbindir} -+ mkdir -p ${DESTDIR}${man4dir} -+ mkdir -p ${DESTDIR}${man8dir} -+ cp man/unionfs.4 ${DESTDIR}${man4dir} -+ cp man/unionctl.8 ${DESTDIR}${man8dir} -+ cp man/uniondbg.8 ${DESTDIR}${man8dir} -+ mkdir -p ${DESTDIR}${moduledir}/kernel/fs -+ifeq (${KERNELMAJVER},2.4) -+ cp unionfs.o ${DESTDIR}${moduledir}/kernel/fs -+else -+ cp unionfs.ko ${DESTDIR}${moduledir}/kernel/fs -+endif - - uninstall: -- if [ -f unionfs.ko ] ; then rm /lib/modules/`uname -r`/kernel/fs/unionfs.ko ; else rm /lib/modules/`uname -r`/kernel/fs/unionfs.o ; fi -- rm ${PREFIX}/man/man8/unionctl.8 -- rm ${PREFIX}/man/man8/uniondbg.8 -- rm ${PREFIX}/man/man4/unionfs.4 -- rm ${PREFIX}/sbin/unionctl -- rm ${PREFIX}/sbin/uniondbg -+ifeq (${KERNELMAJVER},2.4) -+ rm ${DESTDIR}${moduledir}/kernel/fs/unionfs.o -+else -+ rm ${DESTDIR}${moduledir}/kernel/fs/unionfs.ko -+endif -+ rm ${DESTDIR}${man8dir}/unionctl.8 -+ rm ${DESTDIR}${man8dir}/uniondbg.8 -+ rm ${DESTDIR}${man4dir}/unionfs.4 -+ rm ${DESTDIR}${sbindir}/unionctl -+ rm ${DESTDIR}${sbindir}/uniondbg - - release: unionfs-${VERSION}.tar.gz - diff --git a/packages/unionfs/unionfs-modules_1.0.13.bb b/packages/unionfs/unionfs-modules_1.0.13.bb index b18aaa9ac7..8083bddf67 100644 --- a/packages/unionfs/unionfs-modules_1.0.13.bb +++ b/packages/unionfs/unionfs-modules_1.0.13.bb @@ -1,6 +1,3 @@ -# When mickeyl decides to check in the correct make.patch, then the following line can be removed. -DEFAULT_PREFERENCE = "-1" - PARALLEL_MAKE = "" include unionfs-modules.inc @@ -8,5 +5,6 @@ include unionfs-modules.inc KERNEL_MAJMIN = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')[:3]}" do_compile() { + unset LDFLAGS oe_runmake unionfs${KERNEL_MAJMIN} } diff --git a/packages/unionfs/unionfs-modules_1.0.7.bb b/packages/unionfs/unionfs-modules_1.0.7.bb deleted file mode 100644 index ff5e37819a..0000000000 --- a/packages/unionfs/unionfs-modules_1.0.7.bb +++ /dev/null @@ -1,4 +0,0 @@ -include unionfs-modules.inc -include unionfs_${PV}.inc - -PR = "r3" diff --git a/packages/unionfs/unionfs-modules_1.0.8.bb b/packages/unionfs/unionfs-modules_1.0.8.bb deleted file mode 100644 index ff5e37819a..0000000000 --- a/packages/unionfs/unionfs-modules_1.0.8.bb +++ /dev/null @@ -1,4 +0,0 @@ -include unionfs-modules.inc -include unionfs_${PV}.inc - -PR = "r3" diff --git a/packages/unionfs/unionfs-modules_1.0.9.bb b/packages/unionfs/unionfs-modules_1.0.9.bb deleted file mode 100644 index 5858b7994f..0000000000 --- a/packages/unionfs/unionfs-modules_1.0.9.bb +++ /dev/null @@ -1,2 +0,0 @@ -include unionfs-modules.inc -include unionfs_${PV}.inc diff --git a/packages/unionfs/unionfs-utils_1.0.13.bb b/packages/unionfs/unionfs-utils_1.0.13.bb index c7565e2364..be08882810 100644 --- a/packages/unionfs/unionfs-utils_1.0.13.bb +++ b/packages/unionfs/unionfs-utils_1.0.13.bb @@ -1,5 +1,2 @@ -# When mickeyl decides to check in the correct make.patch, then the following line can be removed. -DEFAULT_PREFERENCE = "-1" - include unionfs-utils.inc diff --git a/packages/unionfs/unionfs-utils_1.0.7.bb b/packages/unionfs/unionfs-utils_1.0.7.bb deleted file mode 100644 index 8d97fc7466..0000000000 --- a/packages/unionfs/unionfs-utils_1.0.7.bb +++ /dev/null @@ -1,4 +0,0 @@ -include unionfs-utils.inc -include unionfs_${PV}.inc - -PR = "r3" diff --git a/packages/unionfs/unionfs-utils_1.0.8.bb b/packages/unionfs/unionfs-utils_1.0.8.bb deleted file mode 100644 index 8d97fc7466..0000000000 --- a/packages/unionfs/unionfs-utils_1.0.8.bb +++ /dev/null @@ -1,4 +0,0 @@ -include unionfs-utils.inc -include unionfs_${PV}.inc - -PR = "r3" diff --git a/packages/unionfs/unionfs-utils_1.0.9.bb b/packages/unionfs/unionfs-utils_1.0.9.bb deleted file mode 100644 index bbca67a3b7..0000000000 --- a/packages/unionfs/unionfs-utils_1.0.9.bb +++ /dev/null @@ -1,2 +0,0 @@ -include unionfs-utils.inc -include unionfs_${PV}.inc |