summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/slugos.inc2
-rw-r--r--packages/apex/apex_1.4.7.bb (renamed from packages/apex/apex_1.4.5.bb)17
-rw-r--r--packages/apex/nslu2/defconfig13
-rw-r--r--packages/images/slugos-image.bb11
-rw-r--r--packages/images/slugos-imagename.bb1
-rw-r--r--packages/ixp4xx/ixp4xx-npe_2.3.bb7
-rw-r--r--packages/libpcre/libpcre-native_4.4.bb4
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.19-rc5.bb (renamed from packages/linux/ixp4xx-kernel_2.6.19-rc3.bb)2
-rw-r--r--packages/meta/unslung-binary-kernel-packages.bb3
-rw-r--r--packages/meta/unslung-packages.bb3
-rw-r--r--packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb16
-rw-r--r--packages/povray/povray_3.6.1.bb2
-rw-r--r--packages/slugimage/slugimage-native.bb2
-rw-r--r--packages/slugimage/slugimage.bb14
-rw-r--r--packages/tasks/task-essential-parts.bb63
-rw-r--r--packages/tasks/task-essential-to-boot.bb35
-rw-r--r--packages/tasks/task-qpe.bb8
-rw-r--r--packages/upslug/upslug2.inc10
18 files changed, 60 insertions, 153 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 07b144c7c1..299944ee29 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -171,7 +171,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
# Select the correct versions of the kernel and modules (these are the
# defaults, override in the conf/distro top-level distro file).
PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.18"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19-rc5"
# Select the smallest provider of x11 libraries
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
diff --git a/packages/apex/apex_1.4.5.bb b/packages/apex/apex_1.4.7.bb
index 35d772aa0b..0a7d5520fc 100644
--- a/packages/apex/apex_1.4.5.bb
+++ b/packages/apex/apex_1.4.7.bb
@@ -23,18 +23,19 @@ CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linu
# defconfig to .config
do_configure() {
rm -f ${S}/.config
- echo "CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config'
if test '${ARCH_BYTE_SEX}' = be
then
- echo 'CONFIG_USER_BIGENDIAN=y' >>'${S}/.config'
- echo 'CONFIG_BIGENDIAN=y' >>'${S}/.config'
+ sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
+ -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
+ ${WORKDIR}/defconfig > ${S}/.config
else
- echo 'CONFIG_USER_LITTLEENDIAN=y' >>'${S}/.config'
- echo 'CONFIG_LITTLEENDIAN=y' >>'${S}/.config'
+ sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
+ -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
+ -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
+ ${WORKDIR}/defconfig > ${S}/.config
fi
- sed -e '/CONFIG_USER_BIGENDIAN/d' -e '/CONFIG_USER_LITTLEENDIAN/d' \
- -e '/CONFIG_ENV_DEFAULT_CMDLINE/d' \
- ${S}/src/mach-ixp42x/debian-nslu2-arm_config >>${S}/.config
oe_runmake oldconfig
}
diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig
index 113c69a68e..2d2784457a 100644
--- a/packages/apex/nslu2/defconfig
+++ b/packages/apex/nslu2/defconfig
@@ -48,7 +48,7 @@ CONFIG_MACH_NSLU2=y
# CONFIG_MACH_AVILA2347 is not set
# CONFIG_USER_DEFAULTENDIAN is not set
# CONFIG_USER_BIGENDIAN is not set
-CONFIG_USER_LITTLEENDIAN=y
+# CONFIG_USER_LITTLEENDIAN is not set
#
# Platform Setup
@@ -89,8 +89,7 @@ CONFIG_CMD_XRECEIVE=y
#
# CONFIG_DRIVER_FAT is not set
# CONFIG_DRIVER_EXT2 is not set
-CONFIG_DRIVER_JFFS2=y
-CONFIG_DRIVER_JFFS2_BLOCKDEVICE="nor:0x180000+0x660000"
+# CONFIG_DRIVER_JFFS2 is not set
CONFIG_DRIVER_FIS=y
CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k"
CONFIG_DRIVER_NOR_CFI=y
@@ -102,21 +101,25 @@ CONFIG_USES_PATHNAME_PARSER=y
# Environment
#
CONFIG_ENV=y
+# CONFIG_NO_BOOTSTRAP is not set
CONFIG_NOR_BOOT=y
# CONFIG_NAND_BOOT is not set
+# CONFIG_COMPANION_EVT1_BOOT is not set
+# CONFIG_COMPANION_EVT2_BOOT is not set
CONFIG_AUTOBOOT=y
CONFIG_AUTOBOOT_DELAY=10
CONFIG_ENV_MUTABLE=y
CONFIG_ENV_LINK=y
CONFIG_ENV_REGION="nor:0x7fc000+15k"
+CONFIG_ENV_CHECK_LEN=1024
CONFIG_ENV_STARTUP_KERNEL_COPY=y
CONFIG_ENV_REGION_KERNEL="fis://kernel"
-CONFIG_ENV_REGION_KERNEL_SWAP=y
+# CONFIG_ENV_REGION_KERNEL_SWAP is not set
# CONFIG_ENV_STARTUP_RAMDISK_COPY is not set
CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
CONFIG_ENV_DEFAULT_CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug"
# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
CONFIG_USES_NOR_BOOTFLASH=y
-CONFIG_LITTLEENDIAN=y
+# CONFIG_LITTLEENDIAN is not set
CONFIG_CLEAR_STACKS=y
CONFIG_ALIASES=y
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 90a5cefcbe..9ef1e6ee88 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -8,6 +8,8 @@ HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
PR = "r37"
+COMPATIBLE_MACHINE = "nslu2"
+
# SLUGOS_IMAGENAME defines the name of the image to be build, if it
# is not set this package will be skipped!
IMAGE_BASENAME = "${SLUGOS_IMAGENAME}"
@@ -115,7 +117,7 @@ python () {
# it is a bad idea to produce flash images without a valid RedBoot - that allows
# an innocent user upgrade attempt to instantly brick the NSLU2.
PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
-PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
+PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
NSLU2_SLUGIMAGE_ARGS ?= ""
@@ -127,13 +129,16 @@ nslu2_pack_image() {
${STAGING_LIBDIR}/nslu2-binaries/Trailer \
${STAGING_LIBDIR}/nslu2-binaries/SysConf \
${DEPLOY_DIR_IMAGE}/slug/
+ install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/
install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${ARCH_BYTE_SEX} \
${DEPLOY_DIR_IMAGE}/slug/vmlinuz
install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2
+ install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/
cd ${DEPLOY_DIR_IMAGE}/slug
- slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t \
- Trailer -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \
+ slugimage -p -b RedBoot -s SysConf -L apex.bin -k vmlinuz \
+ -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \
+ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \
${NSLU2_SLUGIMAGE_ARGS}
rm -rf ${DEPLOY_DIR_IMAGE}/slug
fi
diff --git a/packages/images/slugos-imagename.bb b/packages/images/slugos-imagename.bb
index 01cca8a0c3..61629d44af 100644
--- a/packages/images/slugos-imagename.bb
+++ b/packages/images/slugos-imagename.bb
@@ -9,6 +9,7 @@ PACKAGES = ""
INHIBIT_DEFAULT_DEPS = "1"
SLUGOS_IMAGENAME ?= "slugos"
+COMPATIBLE_MACHINE = "nslu2"
do_fetch() {
}
diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb
index 039308ac47..dcff23b645 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.3.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
LICENSE = "Intel Public Licence"
-PR = "r6"
+PR = "r8"
DEPENDS = "ixp4xx-npe-native"
SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_3.zip"
@@ -26,3 +26,8 @@ do_install() {
install ${S}/NPE-B ${D}/${base_libdir}/firmware/
}
+do_populate_staging() {
+ install -d ${STAGING_FIRMWARE_DIR}
+ install ${S}/NPE-B ${STAGING_FIRMWARE_DIR}/
+}
+
diff --git a/packages/libpcre/libpcre-native_4.4.bb b/packages/libpcre/libpcre-native_4.4.bb
index 7be8ffd0ac..a1813423c0 100644
--- a/packages/libpcre/libpcre-native_4.4.bb
+++ b/packages/libpcre/libpcre-native_4.4.bb
@@ -2,3 +2,7 @@ SECTION = "unknown"
require libpcre_${PV}.bb
inherit native
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}"
+
+# NOTE: multiple providers are available (libpcre, libpcre-native);
+# NOTE: consider defining PREFERRED_PROVIDER_pcre
+PROVIDES = ""
diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc3.bb b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb
index 3b1453c38b..bfb9dccb80 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19-rc3.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "534"
+IXP4XX_KERNEL_SVN_REV = "577"
#
# The directory containing the patches to be applied is
# specified below
diff --git a/packages/meta/unslung-binary-kernel-packages.bb b/packages/meta/unslung-binary-kernel-packages.bb
index dfe2ec029e..2b6d64c5e5 100644
--- a/packages/meta/unslung-binary-kernel-packages.bb
+++ b/packages/meta/unslung-binary-kernel-packages.bb
@@ -1,6 +1,7 @@
DESCRIPTION = "Packages that are compatible with the Unslung binary kernel firmware"
LICENSE = MIT
-PR = "r0"
+PR = "r1"
+COMPATIBLE_MACHINE = "nslu2"
ALLOW_EMPTY = 1
PACKAGES = "${PN}"
diff --git a/packages/meta/unslung-packages.bb b/packages/meta/unslung-packages.bb
index 21a55ae957..9bd77ff746 100644
--- a/packages/meta/unslung-packages.bb
+++ b/packages/meta/unslung-packages.bb
@@ -1,6 +1,7 @@
DESCRIPTION = "Packages that are compatible with the Unslung firmware"
LICENSE = MIT
-PR = "r3"
+PR = "r4"
+COMPATIBLE_MACHINE = "nslu2"
ALLOW_EMPTY = 1
PACKAGES = "${PN}"
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
index 1a1c43344f..5f1f6b041f 100644
--- a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
@@ -3,17 +3,5 @@ LICENSE = "GPL"
ALLOW_EMPTY = "1"
PACKAGES = "${PN}"
PACKAGE_ARCH = "all"
-
-DEPENDS = "opie-mediaplayer1 \
- opie-mediaplayer1-libtremorplugin \
- opie-mediaplayer2-skin-default \
- libogg \
- libvorbis \
- libmad "
-
-RDEPENDS = "opie-mediaplayer1 \
- opie-mediaplayer1-libtremorplugin \
- opie-mediaplayer2-skin-default \
- libogg0 \
- libmad0 \
- libvorbis "
+RDEPENDS = "opie-mediaplayer1 opie-mediaplayer1-libtremorplugin opie-mediaplayer1-libmadplugin"
+PR = "r1"
diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb
index c8d9220da6..12e0a043b3 100644
--- a/packages/povray/povray_3.6.1.bb
+++ b/packages/povray/povray_3.6.1.bb
@@ -4,7 +4,7 @@ SECTION = "console/graphics"
#Make this a weak assigment to allow branding of the povray binary
LICENSE = "povray"
-DEPENDS = "virtual/libx11 libz jpeg libpng tiff"
+DEPENDS = "virtual/libx11 zlib jpeg libpng tiff"
RDEPENDS = ""
PR = "r1"
diff --git a/packages/slugimage/slugimage-native.bb b/packages/slugimage/slugimage-native.bb
index 81328ae414..8b60ff1b59 100644
--- a/packages/slugimage/slugimage-native.bb
+++ b/packages/slugimage/slugimage-native.bb
@@ -9,5 +9,5 @@ inherit native
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugimage-${PV}', '${FILE_DIRNAME}/slugimage', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
do_stage () {
- install -m 0755 slugimage/slugimage ${STAGING_BINDIR}/
+ install -m 0755 slugimage ${STAGING_BINDIR}/
}
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index 6b672cdc23..d553a21777 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -3,14 +3,22 @@ SECTION = "console/utils"
LICENSE = "BSD"
DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
flash images for the Linksys NSLU2 device. It also has jffs2 support"
-PR = "r4"
+PR = "r6"
RDEPENDS = "perl"
-SRC_URI = "cvs://anonymous:@nslu.cvs.sourceforge.net/cvsroot/nslu;module=slugimage;tag=SLUGIMAGE_3_2"
+SLUGIMAGE_SVN_REV ?= 77
+SLUGIMAGE_SVN_REPO ?= http://svn.nslu2-linux.org/svnroot/slugimage/trunk
+
+addtask svnfetch before do_configure after do_patch
+
+do_svnfetch() {
+ svn co ${SLUGIMAGE_SVN_REPO} --revision ${SLUGIMAGE_SVN_REV} ${WORKDIR}
+}
+
S = "${WORKDIR}"
do_install () {
install -d ${D}${bindir}
- install -m 0755 slugimage/slugimage ${D}${bindir}/
+ install -m 0755 slugimage ${D}${bindir}/
}
diff --git a/packages/tasks/task-essential-parts.bb b/packages/tasks/task-essential-parts.bb
deleted file mode 100644
index 82c11537f8..0000000000
--- a/packages/tasks/task-essential-parts.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: task-essential-parts.bb
-# Date: 23-Apr-06
-
-DESCRIPTION = "Creates all task-essential-* tasks"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-######################################################################################
-
-PV = "0.0.1"
-PR = "r1"
-
-######################################################################################
-
-PACKAGE_ARCH = "${MACHINE}"
-ALLOW_EMPTY = 1
-
-PACKAGES = "task-essential-irda task-essential-bluetooth task-essential-bluetooth-all \
- task-essential-sound task-essential-sd task-essential-wifi task-essential-wifi-all \
- task-essential-usbclient task-essential-usbhost task-essential-pcmcia \
- task-essential-userspace task-essential-serial"
-
-######################################################################################
-
-DISTRO_PCMCIA ?= ""
-
-DISTRO_SERIAL ?= ""
-DISTRO_IRDA ?= ""
-DISTRO_BLUETOOTH ?= ""
-DISTRO_SOUND ?= ""
-DISTRO_WIFI ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
- wireless-tools wpa-supplicant-nossl"
-
-DISTRO_USBCLIENT ?= ""
-DISTRO_USBHOST ?= ""
-
-DISTRO_SD ?= ""
-
-DISTRO_USERSPACE ?= "ipkg keymaps"
-
-DISTRO_DEPENDS ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
- ipkg keymaps altboot wireless-tools wpa-supplicant-nossl"
-
-######################################################################################
-
-RDEPENDS_task-essential-serial = "${KMODULES_SERIAL} ${MACHINE_MODUTILS} ${MACHINE_SERIAL} ${DISTRO_SERIAL}"
-RDEPENDS_task-essential-irda = "task-essential-serial ${KMODULES_IRDA} ${MACHINE_MODUTILS} ${MACHINE_IRDA} ${DISTRO_IRDA}"
-RDEPENDS_task-essential-bluetooth = "${KMODULES_BLUETOOTH} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_BLUETOOTH} "
-RDEPENDS_task-essential-bluetooth-all = "task-essential-bluetooth ${KMODULES_BLUETOOTH_DRIVER} ${DISTRO_BLUETOOTH}"
-RDEPENDS_task-essential-pcmcia = "${KMODULES_PCMCIA} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_PCMCIA} ${DISTRO_PCMCIA}"
-RDEPENDS_task-essential-sound = "${KMODULES_SOUND} ${MACHINE_MODUTILS} ${MACHINE_SOUND} ${DISTRO_SOUND}"
-RDEPENDS_task-essential-sd = "${KMODULES_SD} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_SD} ${DISTRO_SD}"
-RDEPENDS_task-essential-wifi = "${KMODULES_WIFI} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_WIFI}"
-RDEPENDS_task-essential-wifi-all = "task-essential-wifi ${KMODULES_WIFI_DRIVER} ${DISTRO_WIFI}"
-RDEPENDS_task-essential-usbclient = "${KMODULES_USBCLIENT} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBCLIENT} ${DISTRO_USBCLIENT}"
-RDEPENDS_task-essential-usbhost = "${KMODULES_USBHOST} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBHOST} ${DISTRO_USBHOST}"
-RDEPENDS_task-essential-userspace = "${DISTRO_USERSPACE}"
-
-
-DEPENDS = "${MACHINE_DEPENDS} ${DISTRO_DEPENDS}"
diff --git a/packages/tasks/task-essential-to-boot.bb b/packages/tasks/task-essential-to-boot.bb
deleted file mode 100644
index 565823298a..0000000000
--- a/packages/tasks/task-essential-to-boot.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: task-essential-to-boot.bb
-# Date: 23-Apr-06
-
-DESCRIPTION = "This task includes everything to make a bootable image. And not a bit more."
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-######################################################################################
-
-ALLOW_EMPTY = 1
-PACKAGES = "${PN}"
-
-######################################################################################
-
-PV = "0.0.1"
-PR = "r0"
-
-######################################################################################
-
-CORE_EXTRA_D ?= ""
-CORE_EXTRA_RD ?= ""
-
-CORE_PACKAGES_D = "virtual/kernel base-files base-passwd-3.5.9 busybox initscripts \
- sysvinit tinylogin ${CORE_EXTRA_D}"
-
-CORE_PACKAGES_RD = "kernel base-files base-passwd busybox initscripts sysvinit \
- tinylogin ${CORE_EXTRA_RD}"
-
-######################################################################################
-
-DEPENDS = "${CORE_PACKAGES_D}"
-RDEPENDS = "${CORE_PACKAGES_RD}"
diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb
index d6a73739f5..e9c263545d 100644
--- a/packages/tasks/task-qpe.bb
+++ b/packages/tasks/task-qpe.bb
@@ -3,7 +3,7 @@ SECTION = "opie/base"
ALLOW_EMPTY = 1
PACKAGE_ARCH = "all"
LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
task-qpe-multimedia task-qpe-emulators task-qpe-applications \
@@ -74,7 +74,6 @@ RDEPENDS_task-qpe-games = "\
froot \
gemdropx \
glider \
- gnuz \
hexatrolic \
iaimaster \
icebloxx \
@@ -130,11 +129,6 @@ RDEPENDS_task-qpe-emulators = "scummvm"
RDEPENDS_task-qpe-fonts = "\
qpf-bitstream-vera-large \
qpf-bitstream-vera-sans-mono-huge \
- qpf-dejavusans \
- qpf-dejavusanscondensed \
- qpf-dejavusansmono \
- qpf-dejavuserif \
- qpf-dejavuserifcondensed \
qpf-freemono \
qpf-freeserif \
ttf-gentium \
diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc
index 0a91bc3fd1..9bee027034 100644
--- a/packages/upslug/upslug2.inc
+++ b/packages/upslug/upslug2.inc
@@ -1,11 +1,12 @@
# This package builds the 'upslug2' binary upload/flash tool
# for the NSLU2. It is not useful for anything else.
-PR = "r0"
+PR = "r1"
DESCRIPTION = "NSLU2 binary upload tool (version 2)"
HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2"
SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "MIT"
+COMPATIBLE_MACHINE = "nslu2"
# On Linux libpcap does not work. Using libpcap is sub-optimal - it
# is intended for packet capture not management of a new protocol
@@ -28,10 +29,3 @@ S = "${WORKDIR}/upslug2-${PV}"
PACKAGES = "${PN}"
EXTRA_OECONF += "${LIBPCAP_OECONF}"
-
-python () {
- # Don't build upslug2 unless we're targeting an nslu2
- mach = bb.data.getVar("MACHINE", d, 1)
- if mach != 'nslu2':
- raise bb.parse.SkipPackage("upslug2 only builds for the Linksys NSLU2")
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 18:31:58 +0000