summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/devio/devio-native_1.1.bb3
-rw-r--r--packages/devio/devio_1.1.bb1
-rw-r--r--packages/efl/ecore/evas-x11-include.patch10
-rw-r--r--packages/h2200-bootloader/h2200-bootloader.bb2
-rw-r--r--packages/jamvm/jamvm_1.3.2.bb3
-rw-r--r--packages/libsdl/libsdl-qpe_1.2.7.bb2
-rw-r--r--packages/libsdl/libsdl-x11_1.2.7.bb4
-rw-r--r--packages/linux/nslu2-kernel.inc16
-rw-r--r--packages/linux/nslu2-kernel/2.6.14/10-mtdpart-redboot-fis-byteswap.patch42
-rw-r--r--packages/linux/nslu2-kernel/2.6.14/defconfig5
-rw-r--r--packages/linux/nslu2-kernel_2.6.14-rc5.bb (renamed from packages/linux/nslu2-kernel_2.6.14-rc2.bb)8
-rw-r--r--packages/linux/openslug-kernel-2.6.14-rc5/.mtn2git_empty (renamed from packages/linux/openslug-kernel-2.6.14-rc2/.mtn2git_empty)0
-rw-r--r--packages/linux/openslug-kernel-2.6.14-rc5/README (renamed from packages/linux/openslug-kernel-2.6.14-rc2/README)0
-rw-r--r--packages/linux/openslug-kernel-2.6.14-rc5/defconfig (renamed from packages/linux/openslug-kernel-2.6.14-rc2/defconfig)26
-rw-r--r--packages/linux/openslug-kernel_2.6.14-rc5.bb (renamed from packages/linux/openslug-kernel_2.6.14-rc2.bb)2
-rw-r--r--packages/meta/gpe-image.bb2
-rw-r--r--packages/meta/openslug-image.bb38
-rw-r--r--packages/meta/openslug-packages.bb2
-rw-r--r--packages/meta/ucslugc-packages.bb2
-rw-r--r--packages/python/python-native_2.3.3.bb2
-rw-r--r--packages/python/python-native_2.4.0.bb2
-rw-r--r--packages/python/python_2.3.4.bb2
-rw-r--r--packages/python/python_2.4.2.bb2
-rw-r--r--packages/uclibc/files/uClibc.distro3
-rw-r--r--packages/uclibc/files/uClibc.machine8
-rw-r--r--packages/uclibc/uclibc-0.9.28/nslu2/.mtn2git_empty0
-rw-r--r--packages/uclibc/uclibc-0.9.28/nslu2/uClibc.machine8
-rw-r--r--packages/uclibc/uclibc-0.9.28/ucslugc/uClibc.distro (renamed from packages/uclibc/uclibc-0.9.28/ucslugc/uClibc.config)58
-rw-r--r--packages/uclibc/uclibc.inc10
29 files changed, 163 insertions, 100 deletions
diff --git a/packages/devio/devio-native_1.1.bb b/packages/devio/devio-native_1.1.bb
new file mode 100644
index 0000000000..f4f85c1636
--- /dev/null
+++ b/packages/devio/devio-native_1.1.bb
@@ -0,0 +1,3 @@
+# This package builds the devio program for the build architecture
+include devio_1.1.bb
+include devio-native.inc
diff --git a/packages/devio/devio_1.1.bb b/packages/devio/devio_1.1.bb
new file mode 100644
index 0000000000..38021fa141
--- /dev/null
+++ b/packages/devio/devio_1.1.bb
@@ -0,0 +1 @@
+include devio.inc
diff --git a/packages/efl/ecore/evas-x11-include.patch b/packages/efl/ecore/evas-x11-include.patch
new file mode 100644
index 0000000000..4bb40121d0
--- /dev/null
+++ b/packages/efl/ecore/evas-x11-include.patch
@@ -0,0 +1,10 @@
+--- ecore-0.9.9.018/src/lib/ecore_evas/ecore_evas_x.c~ 2005-10-08 08:09:38.000000000 -0700
++++ ecore-0.9.9.018/src/lib/ecore_evas/ecore_evas_x.c 2005-10-14 17:26:06.000000000 -0700
+@@ -8,6 +8,7 @@
+ #include "Ecore_Evas.h"
+ #ifdef BUILD_ECORE_X
+ #include "Ecore_X.h"
++#include <Evas_Engine_XRender_X11.h>
+ #endif
+
+ #ifdef BUILD_ECORE_X
diff --git a/packages/h2200-bootloader/h2200-bootloader.bb b/packages/h2200-bootloader/h2200-bootloader.bb
index bf41d9e10c..9e97cd4ea9 100644
--- a/packages/h2200-bootloader/h2200-bootloader.bb
+++ b/packages/h2200-bootloader/h2200-bootloader.bb
@@ -6,5 +6,5 @@ MAINTAINER = "Koen Kooi <koen@handhelds.org>"
pkg_postinst() {
#!/bin/sh
-modprobe mtdblock && mkdir -p /lib/firmware && modprobe hamcop_nand && dd if=/dev/mtdblock0 of=/lib/firmware/hamcop_bootloader.bin
+modprobe mtdblock; mkdir -p /lib/firmware ; modprobe hamcop_nand ; dd if=/dev/mtdblock0 of=/lib/firmware/hamcop_bootloader.bin
}
diff --git a/packages/jamvm/jamvm_1.3.2.bb b/packages/jamvm/jamvm_1.3.2.bb
index 7d674dc720..60b5aaafd4 100644
--- a/packages/jamvm/jamvm_1.3.2.bb
+++ b/packages/jamvm/jamvm_1.3.2.bb
@@ -11,6 +11,9 @@ RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)"
SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
file://jamvm-1.3.1-size-defaults.patch;patch=1"
+# This uses 32 bit arm, so force the instruction set to arm, not thumb
+ARM_INSTRUCTION_SET = ""
+
inherit autotools update-alternatives
EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
diff --git a/packages/libsdl/libsdl-qpe_1.2.7.bb b/packages/libsdl/libsdl-qpe_1.2.7.bb
index a976f844eb..5eaf9c54b0 100644
--- a/packages/libsdl/libsdl-qpe_1.2.7.bb
+++ b/packages/libsdl/libsdl-qpe_1.2.7.bb
@@ -7,7 +7,7 @@ PROVIDES = "virtual/libsdl"
LICENSE = "LGPL"
# NOTE: make sure to keep PR in sync with libsdl-x11
-PR = "r6"
+PR = "r7"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://agawa-piro-mickey.patch;patch=1 \
diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb
index da96517041..e65fe4fba3 100644
--- a/packages/libsdl/libsdl-x11_1.2.7.bb
+++ b/packages/libsdl/libsdl-x11_1.2.7.bb
@@ -7,7 +7,7 @@ PROVIDES = "virtual/libsdl"
LICENSE = "LGPL"
# NOTE: make sure to keep PR in sync with libsdl-qpe
-PR = "r6"
+PR = "r7"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://extra-keys.patch;patch=1 \
@@ -16,7 +16,7 @@ S = "${WORKDIR}/SDL-${PV}"
inherit autotools binconfig
-EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
+EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
--enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
--disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index d55d05f294..0128b6e532 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -260,6 +260,7 @@ do_configure_prepend() {
# e3a01c02 e3811055
# 2) For LE kernels it is necessary to prefix change-to-le code to the kernel image:
# ee110f10 e3c00080 ee010f10
+# and to byte swap the (LE) image to match the BE flash layout
#
# The argument to the function is the destination directory
redboot_fixup_armeb() {
@@ -274,12 +275,15 @@ redboot_fixup_armeb() {
redboot_fixup_arm() {
rm -f "$1".new
devio '<<arch/${ARCH}/boot/${KERNEL_IMAGETYPE}' >"$1".new \
- 'wl 0xe3a01c02,4' \
- 'wl 0xe3811055,4' \
- 'wl 0xee110f10,4' \
- 'wl 0xe3c00080,4' \
- 'wl 0xee010f10,4' \
- 'cp$'
+ 'wb 0xe3a01c02,4' \
+ 'wb 0xe3811055,4' \
+ 'wb 0xee110f10,4' \
+ 'wb 0xe3c00080,4' \
+ 'wb 0xee010f10,4' \
+ 'xp $,4' || {
+ echo 'ERROR: arch/${ARCH}/boot/${KERNEL_IMAGETYPE}: failed to byteswap zImage' >&2
+ return 1
+ }
mv "$1".new "$1"
}
diff --git a/packages/linux/nslu2-kernel/2.6.14/10-mtdpart-redboot-fis-byteswap.patch b/packages/linux/nslu2-kernel/2.6.14/10-mtdpart-redboot-fis-byteswap.patch
new file mode 100644
index 0000000000..c5e322ccac
--- /dev/null
+++ b/packages/linux/nslu2-kernel/2.6.14/10-mtdpart-redboot-fis-byteswap.patch
@@ -0,0 +1,42 @@
+On IXP4XX systems the FIS directory is big endian even with a little
+endian kernel. This patch recognises the FIS directory on such a
+system and byte swaps it to obtain a valid table based on the 'size'
+field of the FIS directory (the size field is know to always match the
+erase block size on such systems, and probably all systems.)
+
+--- linux-2.6.13/drivers/mtd/redboot.c.orig 2005-10-19 17:14:19.304956677 -0700
++++ linux-2.6.13/drivers/mtd/redboot.c 2005-10-19 17:48:16.457146582 -0700
+@@ -89,8 +89,32 @@
+ i = numslots;
+ break;
+ }
+- if (!memcmp(buf[i].name, "FIS directory", 14))
++ if (!memcmp(buf[i].name, "FIS directory", 14)) {
++ /* This is apparently the FIS directory entry for the
++ * FIS directory itself. The FIS directory size is
++ * one erase block, if the buf[i].size field is
++ * swab32(erasesize) then we know we are looking at
++ * a byte swapped FIS directory - swap all the entries!
++ * (NOTE: this is 'size' not 'data_length', size is
++ * the full size of the entry.)
++ */
++ if (swab32(buf[i].size) == master->erasesize) {
++ int j;
++ for (j = 0; j < numslots && buf[j].name[0] != 0xff; ++j) {
++ /* The unsigned long fields were written with the
++ * wrong byte sex, name and pad have no byte sex.
++ */
++ swab32s(&buf[j].flash_base);
++ swab32s(&buf[j].mem_base);
++ swab32s(&buf[j].size);
++ swab32s(&buf[j].entry_point);
++ swab32s(&buf[j].data_length);
++ swab32s(&buf[j].desc_cksum);
++ swab32s(&buf[j].file_cksum);
++ }
++ }
+ break;
++ }
+ }
+ if (i == numslots) {
+ /* Didn't find it */
diff --git a/packages/linux/nslu2-kernel/2.6.14/defconfig b/packages/linux/nslu2-kernel/2.6.14/defconfig
index 3cffa0f520..d297a57ebd 100644
--- a/packages/linux/nslu2-kernel/2.6.14/defconfig
+++ b/packages/linux/nslu2-kernel/2.6.14/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.14-rc3
-# Fri Oct 7 19:32:33 2005
+# Linux kernel version: 2.6.14-rc4
+# Tue Oct 18 21:53:12 2005
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -559,6 +559,7 @@ CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
diff --git a/packages/linux/nslu2-kernel_2.6.14-rc2.bb b/packages/linux/nslu2-kernel_2.6.14-rc5.bb
index e843fcfa29..d6979446c0 100644
--- a/packages/linux/nslu2-kernel_2.6.14-rc2.bb
+++ b/packages/linux/nslu2-kernel_2.6.14-rc5.bb
@@ -8,7 +8,7 @@ PR_CONFIG = "0"
# Increment the number below (i.e. the digits after PR) when
# making changes within this file or for changes to the patches
# applied to the kernel.
-PR = "r6.${PR_CONFIG}"
+PR = "r0.${PR_CONFIG}"
include nslu2-kernel.inc
@@ -25,16 +25,14 @@ N2K_FILES = ""
N2K_PATCHES = "\
file://10-ixp4xx-copy-from.patch;patch=1 \
- file://10-ixp4xx-gpio.patch;patch=1 \
- file://15-ixp4xx-set-irq-type-return.patch;patch=1 \
+ file://10-mtdpart-redboot-fis-byteswap.patch;patch=1 \
file://15-ixp4xx-writesb-l-w.patch;patch=1 \
file://20-timer.patch;patch=1 \
file://25-nslu2-arch-reset.patch;patch=1 \
file://30-i2c-x1205.patch;patch=1 \
file://50-nslu2-arch.patch;patch=1 \
- file://50-nslu2-beeper.patch;patch=1 \
file://50-nslu2-general.patch;patch=1 \
- file://90-arm-le.patch;patch=1 \
+ file://60-nslu2-beeper.patch;patch=1 \
file://90-ixp4xx-pci-le.patch;patch=1 \
file://anonymiser.patch;patch=1 \
"
diff --git a/packages/linux/openslug-kernel-2.6.14-rc2/.mtn2git_empty b/packages/linux/openslug-kernel-2.6.14-rc5/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openslug-kernel-2.6.14-rc2/.mtn2git_empty
+++ b/packages/linux/openslug-kernel-2.6.14-rc5/.mtn2git_empty
diff --git a/packages/linux/openslug-kernel-2.6.14-rc2/README b/packages/linux/openslug-kernel-2.6.14-rc5/README
index 45bc76579e..45bc76579e 100644
--- a/packages/linux/openslug-kernel-2.6.14-rc2/README
+++ b/packages/linux/openslug-kernel-2.6.14-rc5/README
diff --git a/packages/linux/openslug-kernel-2.6.14-rc2/defconfig b/packages/linux/openslug-kernel-2.6.14-rc5/defconfig
index 422534267c..3a6c7777d3 100644
--- a/packages/linux/openslug-kernel-2.6.14-rc2/defconfig
+++ b/packages/linux/openslug-kernel-2.6.14-rc5/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.14-rc2
-# Sat Sep 24 16:19:17 2005
+# Linux kernel version: 2.6.14-rc4
+# Tue Oct 18 21:53:12 2005
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -121,7 +121,7 @@ CONFIG_CPU_TLB_V4WBI=y
# Processor Features
#
CONFIG_ARM_THUMB=y
-CONFIG_CPU_BIG_ENDIAN=y
+# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_XSCALE_PMU=y
CONFIG_DMABOUNCE=y
@@ -150,6 +150,7 @@ CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_LEDS is not set
CONFIG_ALIGNMENT_TRAP=y
#
@@ -168,6 +169,7 @@ CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=
# At least one emulation must be selected
#
CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
# CONFIG_FPE_FASTFPE is not set
#
@@ -278,6 +280,7 @@ CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_TARGET_TCPMSS=m
+# CONFIG_IP_NF_TARGET_NFQUEUE is not set
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -304,6 +307,7 @@ CONFIG_IP_NF_TARGET_CLASSIFY=m
#
# CONFIG_IP6_NF_QUEUE is not set
# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP6_NF_TARGET_NFQUEUE is not set
#
# Bridge: Netfilter Configuration
@@ -390,7 +394,7 @@ CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
# CONFIG_MTD_AFS_PARTS is not set
#
@@ -408,10 +412,14 @@ CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
# CONFIG_MTD_JEDECPROBE is not set
CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+# CONFIG_MTD_CFI_NOSWAP is not set
+CONFIG_MTD_CFI_BE_BYTE_SWAP=y
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
@@ -419,6 +427,7 @@ CONFIG_MTD_CFI_I1=y
CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_CFI_I4 is not set
# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
CONFIG_MTD_CFI_INTELEXT=y
# CONFIG_MTD_CFI_AMDSTD is not set
# CONFIG_MTD_CFI_STAA is not set
@@ -550,6 +559,7 @@ CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
@@ -602,6 +612,7 @@ CONFIG_BLK_DEV_DM=m
# CONFIG_FUSION is not set
# CONFIG_FUSION_SPI is not set
# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
#
# IEEE 1394 (FireWire) support
@@ -639,6 +650,7 @@ CONFIG_NET_ETHERNET=y
CONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
diff --git a/packages/linux/openslug-kernel_2.6.14-rc2.bb b/packages/linux/openslug-kernel_2.6.14-rc5.bb
index 36010dd40e..b30d767916 100644
--- a/packages/linux/openslug-kernel_2.6.14-rc2.bb
+++ b/packages/linux/openslug-kernel_2.6.14-rc5.bb
@@ -5,4 +5,4 @@
include nslu2-kernel_${PV}.bb
# Increment the following if the openslug-kernel defconfig is
# changed.
-PR_CONFIG = "1"
+PR_CONFIG = "0"
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 1e75c49413..edf41f7eae 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -24,8 +24,6 @@ GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
#ship more stuff with devices with >16MB of flash
GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
gpe-theme-clearlooks \
- gpe-filemanager \
- gpe-nmf \
figment \
",d)}'
diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb
index 177ce25737..e351d3ba08 100644
--- a/packages/meta/openslug-image.bb
+++ b/packages/meta/openslug-image.bb
@@ -1,35 +1,47 @@
-PR = "r14"
+# This describes a generic NSLU2 image, even though the bb file is
+# called 'openslug-image.bb' the OpenSlug specific configuration is
+# done in conf/distro/openslug.conf
+#
+PR = "r15"
IMAGE_BASENAME = "openslug"
IMAGE_LINGUAS = ""
+# Setting USE_DEVFS prevents *any* entries being created initially
+# in /dev
USE_DEVFS = "1"
-OPENSLUG_HIDDEN_PACKAGES = "ipkg-native ipkg-utils-native fakeroot-native ${PATCH_DEPENDS} virtual/armeb-linux-uclibc-gcc \
- virtual/libc makedevs-native mtd-utils-native slugimage-native nslu2-linksys-firmware "
+# diff, cpio and find are required for reflash and turnup ram.
+# Removing these probably leaves the system bootable, but standard
+# openslug and ucslugc stuff won't work, so only take these out in
+# very non-standard turnkey ucslugc builds.
+OPENSLUG_SUPPORT ?= "diffutils cpio findutils"
+# NOTE: file system kernel modules are defined in openslug.conf
+# (OPENSLUG_EXTRA_FILESYSTEMS, included in OPENSLUG_EXTRA_INSTALL)
+# kernel-module-af-packet must be in the image for DHCP to work
+OPENSLUG_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole"
+
+# The things explicitly included in the following lists are the
+# absolute minimum to have any chance of a bootable system.
DEPENDS = "virtual/kernel base-files base-passwd \
busybox dropbear hotplug-ng initscripts-openslug netbase \
sysvinit tinylogin portmap \
virtual/ixp-eth openslug-init \
module-init-tools modutils-initscripts \
- ipkg-collateral ipkg ipkg-link diffutils \
- cpio findutils mtd-utils udev \
+ ipkg-collateral ipkg ipkg-link \
+ ${OPENSLUG_SUPPORT} \
${OPENSLUG_EXTRA_DEPENDS}"
-# NOTE: file system kernel modules are defined in openslug.conf
-# (OPENSLUG_EXTRA_FILESYSTEMS, included in OPENSLUG_EXTRA_INSTALL)
-# kernel-module-af-packet must be in the image for DHCP to work
IPKG_INSTALL = "base-files base-passwd \
busybox dropbear hotplug-ng initscripts-openslug netbase \
update-modules sysvinit tinylogin portmap \
${PREFERRED_PROVIDER_virtual/ixp-eth} openslug-init \
module-init-tools modutils-initscripts \
- ipkg-collateral ipkg ipkg-link diffutils \
- cpio findutils \
- kernel-module-af-packet \
- kernel-module-netconsole \
- ${OPENSLUG_EXTRA_INSTALL}"
+ ipkg-collateral ipkg ipkg-link \
+ ${OPENSLUG_SUPPORT} \
+ ${OPENSLUG_KERNEL} \
+ ${OPENSLUG_EXTRA_INSTALL}"
inherit image_ipk
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 4fa516f582..dc7564b20a 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -67,12 +67,14 @@ OPENSLUG_PACKAGES = "\
mailx \
make \
man man-pages \
+ mdadm \
mgetty \
miau \
microcom \
minicom \
monotone-5 \
mpd \
+ mtd-utils \
mt-daapd \
mutt \
mysql \
diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb
index fe073e2c27..b551155287 100644
--- a/packages/meta/ucslugc-packages.bb
+++ b/packages/meta/ucslugc-packages.bb
@@ -85,10 +85,12 @@ UCSLUGC_PACKAGES = "\
m4 \
mailx \
make \
+ mdadm \
mgetty \
miau \
microcom \
mpd \
+ mtd-utils \
mt-daapd \
mutt \
nail \
diff --git a/packages/python/python-native_2.3.3.bb b/packages/python/python-native_2.3.3.bb
index f880e49018..8f2e782a7b 100644
--- a/packages/python/python-native_2.3.3.bb
+++ b/packages/python/python-native_2.3.3.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
DEPENDS = ""
PR = "r1"
-SRC_URI = "ftp://www.python.org/pub/python/${PV}/Python-${PV}.tar.bz2 \
+SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
file://bindir-libdir.patch;patch=1 \
file://cross-distutils.patch;patch=1"
S = "${WORKDIR}/Python-${PV}"
diff --git a/packages/python/python-native_2.4.0.bb b/packages/python/python-native_2.4.0.bb
index 1fba9a2557..00092d1e15 100644
--- a/packages/python/python-native_2.4.0.bb
+++ b/packages/python/python-native_2.4.0.bb
@@ -9,7 +9,7 @@ PR = "r0"
EXCLUDE_FROM_WORLD = "1"
-SRC_URI = "ftp://www.python.org/pub/python/2.4/Python-2.4.tar.bz2 \
+SRC_URI = "http://www.python.org/ftp/python/2.4/Python-2.4.tar.bz2 \
file://bindir-libdir.patch;patch=1 \
file://cross-distutils.patch;patch=1"
S = "${WORKDIR}/Python-2.4"
diff --git a/packages/python/python_2.3.4.bb b/packages/python/python_2.3.4.bb
index 853375bd11..de9c15c350 100644
--- a/packages/python/python_2.3.4.bb
+++ b/packages/python/python_2.3.4.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
DEPENDS = "python-native zlib gdbm"
PR = "ml4"
-SRC_URI = "ftp://www.python.org/pub/python/${PV}/Python-${PV}.tar.bz2 \
+SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
file://bindir-libdir.patch;patch=1 \
file://crosscompile.patch;patch=1"
S = "${WORKDIR}/Python-${PV}"
diff --git a/packages/python/python_2.4.2.bb b/packages/python/python_2.4.2.bb
index 34c8fc7ba4..aad93d0d59 100644
--- a/packages/python/python_2.4.2.bb
+++ b/packages/python/python_2.4.2.bb
@@ -10,7 +10,7 @@ PR = "ml2"
PYTHON_MAJMIN = "2.4"
-SRC_URI = "ftp://www.python.org/pub/python/${PV}/Python-${PV}.tar.bz2 \
+SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
file://bindir-libdir.patch;patch=1 \
file://crosscompile.patch;patch=1 \
file://fix-tkinter-detection.patch;patch=1"
diff --git a/packages/uclibc/files/uClibc.distro b/packages/uclibc/files/uClibc.distro
new file mode 100644
index 0000000000..d87b891b41
--- /dev/null
+++ b/packages/uclibc/files/uClibc.distro
@@ -0,0 +1,3 @@
+# Default per-distro config
+# DO NOT CHANGE THIS
+# Create a new file ${DISTRO}/uClibc.distro
diff --git a/packages/uclibc/files/uClibc.machine b/packages/uclibc/files/uClibc.machine
new file mode 100644
index 0000000000..66346b90f3
--- /dev/null
+++ b/packages/uclibc/files/uClibc.machine
@@ -0,0 +1,8 @@
+# Default per-machine config
+# DO NOT CHANGE THIS
+# Create a new file ${MACHINE}/uClibc.distro
+# Use this file for information which is specific to the machine,
+# as opposed to the architecture (e.g. nslu2 as opposed to armeb or arm)
+# KISS: this file gets includes last, nothing in here can be
+# overridden. Restrict things in here to things which are absolutely
+# and certainly true for this machine.
diff --git a/packages/uclibc/uclibc-0.9.28/nslu2/.mtn2git_empty b/packages/uclibc/uclibc-0.9.28/nslu2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.28/nslu2/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-0.9.28/nslu2/uClibc.machine b/packages/uclibc/uclibc-0.9.28/nslu2/uClibc.machine
new file mode 100644
index 0000000000..a3dde947cf
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.28/nslu2/uClibc.machine
@@ -0,0 +1,8 @@
+# NSLU2 specific machine overrides.
+#
+# NSLU2 can be arm or armeb - the ARCH (arm,armeb) decides
+# this, NSLU2 is always XScale - this file enfoces this.
+#
+CONFIG_ARM_XSCALE=y
+ARCH_HAS_MMU=y
+HAS_FPU=n
diff --git a/packages/uclibc/uclibc-0.9.28/ucslugc/uClibc.config b/packages/uclibc/uclibc-0.9.28/ucslugc/uClibc.distro
index f6810dc56e..7019e97369 100644
--- a/packages/uclibc/uclibc-0.9.28/ucslugc/uClibc.config
+++ b/packages/uclibc/uclibc-0.9.28/ucslugc/uClibc.distro
@@ -1,57 +1,7 @@
-#
-# Automatically generated make config: don't edit
-#
-# TARGET_alpha is not set
-TARGET_arm=y
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-HAVE_ELF=y
-ARCH_SUPPORTS_LITTLE_ENDIAN=y
-TARGET_ARCH="arm"
-ARCH_SUPPORTS_BIG_ENDIAN=y
-# CONFIG_GENERIC_ARM is not set
-# CONFIG_ARM610 is not set
-# CONFIG_ARM710 is not set
-# CONFIG_ARM720T is not set
-# CONFIG_ARM920T is not set
-# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
-# CONFIG_ARM1136JF_S is not set
-# CONFIG_ARM_SA110 is not set
-# CONFIG_ARM_SA1100 is not set
-CONFIG_ARM_XSCALE=y
-# ARCH_LITTLE_ENDIAN is not set
-ARCH_BIG_ENDIAN=y
-# ARCH_HAS_NO_MMU is not set
-ARCH_HAS_MMU=y
-UCLIBC_HAS_FLOATS=y
-# HAS_FPU is not set
-UCLIBC_HAS_SOFT_FLOAT=y
-DO_C99_MATH=y
-KERNEL_SOURCE="/path/to/kernel/files"
-C_SYMBOL_PREFIX=""
-HAVE_DOT_CONFIG=y
-
+# Contains only the distro specific parts of the uClibc.config -
+# these are appended to the machine config to override the settings.
+# Just copy everything from General Library Settings on into this
+# file...
#
# General Library Settings
#
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc
index 40c08d97ba..910e633ccc 100644
--- a/packages/uclibc/uclibc.inc
+++ b/packages/uclibc/uclibc.inc
@@ -57,7 +57,9 @@ UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}"
UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}"
SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
- file://uClibc.config"
+ file://uClibc.config \
+ file://uClibc.machine \
+ file://uClibc.distro"
UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}"
UCLIBC_STAGE_PREFIX = "${STAGING_DIR}/${HOST_SYS}"
@@ -98,7 +100,11 @@ python do_patch () {
}
do_configure() {
- cp ${WORKDIR}/uClibc.config ${S}/.config
+ rm -f ${S}/.config
+ # This stuff works like the standard OE OVERRIDES - keep the files
+ # in the same order as the default OVERRIDES (well, reverse order,
+ # because unlike overrides the last takes precedence)
+ cat ${WORKDIR}/uClibc.config ${WORKDIR}/uClibc.distro ${WORKDIR}/uClibc.machine >${S}/.config
perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak
perl -i -p -e '${configmangle}' ${S}/.config