diff options
| author | ccsmart <ccsmart@smartpal.de> | 2005-08-01 09:05:42 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-01 09:05:42 +0000 |
| commit | 706225e0cfdbffd3bb4a096f16b1d60aca80a94a (patch) | |
| tree | ada0d7cf7998337f01f3f2dba0dc82ccee2f9ffd | |
| parent | 3959df9cd8b3e894f8fe3e026a480f2e6f8a6ae4 (diff) | |
| parent | 80fa2f11e9c1921e6f78eda539bb24e13b3df05f (diff) | |
merge of 32a8152d0bee4b649384f3a9e102a4676de42023
and b1c87d8b200c1c4fd98633961388fdd092b8e00a
26 files changed, 422 insertions, 386 deletions
diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf new file mode 100644 index 0000000000..f946afe216 --- /dev/null +++ b/conf/distro/openslug-native.conf @@ -0,0 +1,17 @@ +include conf/distro/openslug.conf + +# Corresponting packages should be in openslug-native.bb, +# currently missing: ipkg-utils libtool quilt pkgconfig +ASSUME_PROVIDED = "libtool-cross libtool-native automake-native autoconf-native \ + quilt-native ipkg-utils-native gnu-config-native pkgconfig-native \ + virtual/armeb-linux-gcc virtual/libc update-rc.d" + +# Our build host is armeb, not armv5eb that the kernel reports +BUILD_ARCH = armeb + +# I don't know of any packages we currently need to compile nativly, so here are two examples +BBFILES = "\ +${PKGDIR}/packages/vlan/*.bb \ +${PKGDIR}/packages/gzip/*.bb \ +${OPENSLUG_EXTRA_BBFILES}" + diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index cdeae5834e..6457d89226 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -19,9 +19,9 @@ ${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/cvs/*.bb \ ${PKGDIR}/packages/db/*.bb \ ${PKGDIR}/packages/devio/*.bb \ ${PKGDIR}/packages/diffutils/*.bb \ @@ -140,6 +140,7 @@ ${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 \ @@ -148,6 +149,7 @@ ${PKGDIR}/packages/tar/*.bb \ ${PKGDIR}/packages/thttpd/*.bb \ ${PKGDIR}/packages/timezones/*.bb \ ${PKGDIR}/packages/tinylogin/*.bb \ +${PKGDIR}/packages/udev/*.bb \ ${PKGDIR}/packages/unionfs/*.bb \ ${PKGDIR}/packages/unzip/*.bb \ ${PKGDIR}/packages/update-modules/*.bb \ diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 4c22206a49..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,35 +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" - -# 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 ?= "" - # 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. @@ -54,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 @@ -73,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.) @@ -99,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" @@ -108,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..34bc39a3a3 --- /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 += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_VERSION}" +FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_VERSION}" + +# +# Uncomment the following to get the unstable feeds +#FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/unstable" +#FEED_URIS_append += "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/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/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index a8be7757c3..84d037d330 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -8,7 +8,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa file://intdriven.patch;patch=1 \ file://pollcontroller.patch;patch=1 \ file://mm4.patch;patch=1" -PR = "r6" +PR = "r7" S = "${WORKDIR}" @@ -32,11 +32,11 @@ KERNEL_CC += "${TARGET_CC_ARCH} -mno-thumb-interwork" # #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}/ -} +#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 +#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/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-packages.bb b/packages/meta/openslug-packages.bb index 2c2b17e717..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 \ " @@ -63,8 +64,6 @@ OPENSLUG_PACKAGES = "\ less \ libusb \ libxml2 \ - man \ - man-pages \ miau \ microcom \ mt-daapd \ @@ -79,13 +78,10 @@ OPENSLUG_PACKAGES = "\ pcre \ ppp \ procps \ - psmisc \ puppy \ pwc \ rsync \ - screen \ setpwc \ - streamripper \ sudo \ sysfsutils \ thttpd \ @@ -97,6 +93,7 @@ OPENSLUG_PACKAGES = "\ python \ samba \ sane-backends \ + strace \ thttpd \ vlan \ wget \ @@ -109,19 +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/unionfs/unionfs-1.0.7/.mtn2git_empty b/packages/unionfs/unionfs-1.0.13/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/unionfs/unionfs-1.0.7/.mtn2git_empty +++ 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/.mtn2git_empty b/packages/unionfs/unionfs-1.0.8/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/unionfs/unionfs-1.0.8/.mtn2git_empty +++ /dev/null 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/.mtn2git_empty b/packages/unionfs/unionfs-1.0.9/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/unionfs/unionfs-1.0.9/.mtn2git_empty +++ /dev/null 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 |