diff options
34 files changed, 1146 insertions, 69 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3bab952760..ee926f3dcf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -97,7 +97,8 @@ Mail: jeremy.laine@bolloretelecom.eu Website: http://www.jerryweb.org/ Machines: mpc8313e-rdb Recipes: libexosip2, python-cheetah, python-django, python-pyopenssl, -Recipes: pump, squid, squidview +Recipes: pump, squid, squidview, hostap-daemon, wpa-supplicant, linux, +Recipes: u-boot Person: Joaquim Duran Mail: joaquinduran@adtelecom.es diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index a295c144e7..47bb4b91ef 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -471,7 +471,7 @@ do_deploy() { install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin - if [ -d "${D}lib" ]; then + if [ -d "${D}/lib" ]; then tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib fi diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 16c7b7d14f..eb83cbcbb5 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -119,11 +119,11 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-xorg-versions-X11R7.3.inc -#avr32 only has patches for binutils 2.17 and gcc 4.2.1 in OE -PREFERRED_VERSION_gcc_avr32 = "4.2.1" -PREFERRED_VERSION_gcc-cross_avr32 = "4.2.1" -PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.2.1" -PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.2.1" +#avr32 only has patches for binutils 2.17 and gcc 4.2.2 in OE +PREFERRED_VERSION_gcc_avr32 = "4.2.2" +PREFERRED_VERSION_gcc-cross_avr32 = "4.2.2" +PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.2.2" +PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.2.2" PREFERRED_VERSION_binutils_avr32 = "2.17" PREFERRED_VERSION_binutils-cross_avr32 = "2.17" PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 7e8e60d7dd..7c713e65ea 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -16,8 +16,15 @@ FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-reg BUILD_OPTIMIZATION = "-Os" #Gcc will die with 'internal consistency error when using the above optimizations -FULL_OPTIMIZATION_avr32 = "" -BUILD_OPTIMIZATION_avr32 = "" +#with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports). +#However, some packages require optimizations to compile (e.g. libmad). +#It appears the guilty optimization is "-frename-registers", leaving that one +#out allows the build to proceed normally. -fexpensive-optimizations may be OK, +#it was removed while debugging an issue that ultimately turned out to be due +#to the ICE fixed by gcc-pr32889.patch. It needs to be tested again. +#Note that this testing was done without the gcc-pr32889.patch. +FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer" + CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index a2c37dbdd9..83167b10ce 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -11,7 +11,7 @@ MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "1.3.1" +PREFERRED_VERSION_u-boot = "1.3.2" UBOOT_MACHINE = "MPC8313ERDB_33_config" UBOOT_ENTRYPOINT = "0" UBOOT_LOADADDRESS = "0" diff --git a/packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2 b/packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2 Binary files differnew file mode 100644 index 0000000000..583ea40a84 --- /dev/null +++ b/packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2 diff --git a/packages/binutils/binutils-avr32.inc b/packages/binutils/binutils-avr32.inc new file mode 100644 index 0000000000..e74fb5132a --- /dev/null +++ b/packages/binutils/binutils-avr32.inc @@ -0,0 +1,31 @@ +# Extra tasks required when using Atmel's patches to binutils +# See http://avr32linux.org/twiki/bin/view/Main/BinutilsPatches for +# more information + + +do_avr32_reconf () { + if test ${TARGET_ARCH} == avr32; then + (cd ${S} && autoconf-2.13) || die "Error running autoconf" + for dir in bfd opcodes binutils ld; do + (cd "${S}/$dir" && + aclocal-1.9 && + autoconf && + automake-1.9 && + autoheader) || die "Error reconfiguring $dir" + done + fi +} + + +do_avr32_configure_bfd () { + if test ${TARGET_ARCH} == avr32; then + (cd ${B} && make configure-bfd) || die "Error running 'make configure-bfd'" + (cd ${B}/bfd && make headers) || die "Error running 'make headers'" + fi +} + + + +addtask avr32_reconf after do_patch before do_configure +addtask avr32_configure_bfd after do_configure before do_compile + diff --git a/packages/binutils/binutils.inc b/packages/binutils/binutils.inc index 684cf54b8e..49d3aeaa3c 100644 --- a/packages/binutils/binutils.inc +++ b/packages/binutils/binutils.inc @@ -67,6 +67,11 @@ export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" do_configure () { (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" + + # Fix for issues when system's texinfo version >= 4.10 + # (See https://bugzilla.redhat.com/show_bug.cgi?id=345621) + sed -i -e "s@egrep 'texinfo.*'@egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|4.[1-9][0-9]+|[5-9])'@" '${S}/configure' + oe_runconf # # must prime config.cache to ensure the build of libiberty diff --git a/packages/binutils/binutils_2.17.bb b/packages/binutils/binutils_2.17.bb index 0696a24e72..e721cb41f3 100644 --- a/packages/binutils/binutils_2.17.bb +++ b/packages/binutils/binutils_2.17.bb @@ -1,6 +1,7 @@ require binutils.inc +require binutils-avr32.inc -PR = "r4" +PR = "r5" SRC_URI = \ "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \ @@ -18,8 +19,13 @@ SRC_URI += "\ file://300-012_check_ldrunpath_length.patch;patch=1 \ file://300-001_ld_makefile_patch.patch;patch=1 \ file://400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \ - file://500-avr32-atmel.1.3.0.patch;patch=1 \ - file://501-avr32-fix-pool-alignment.patch;patch=1 \ +" +# removed in favor of the atmel 1.2.6 patch which is supposedly newer (yes) +# file://500-avr32-atmel.1.3.0.patch;patch=1 \ +# file://501-avr32-fix-pool-alignment.patch;patch=1 \ + +SRC_URI_append_avr32 = "\ + file://binutils-2.17.atmel.1.2.6.patch.bz2;patch=1 \ " # Zecke's OSX fixes diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc index 02fe1162bc..1392b3e830 100644 --- a/packages/gcc/gcc-4.2.2.inc +++ b/packages/gcc/gcc-4.2.2.inc @@ -40,6 +40,13 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://intermask-bigendian.patch;patch=1 \ " + +SRC_URI_append_avr32 = " \ + file://gcc-4.2.2.atmel.1.0.8.patch.bz2;patch=1 \ + file://901-avr32-no-cond-exec-before-reload-by-default.patch;patch=1 \ +" + + SRC_URI_append_ep93xx = " \ file://arm-crunch-saveregs.patch;patch=1 \ file://arm-crunch-20000320.patch;patch=1 \ @@ -71,4 +78,4 @@ JAVA = "" EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" -ARM_INSTRUCTION_SET = "arm"
\ No newline at end of file +ARM_INSTRUCTION_SET = "arm" diff --git a/packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch b/packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch new file mode 100644 index 0000000000..ab55ea4da1 --- /dev/null +++ b/packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch @@ -0,0 +1,13 @@ +Index: gcc-4.2.2/gcc/config/avr32/avr32.c +=================================================================== +--- gcc-4.2.2.orig/gcc/config/avr32/avr32.c 2008-04-08 10:42:47.000000000 +0200 ++++ gcc-4.2.2/gcc/config/avr32/avr32.c 2008-04-08 10:43:33.000000000 +0200 +@@ -161,7 +161,7 @@ + /* Set default target_flags. */ + #undef TARGET_DEFAULT_TARGET_FLAGS + #define TARGET_DEFAULT_TARGET_FLAGS \ +- (MASK_HAS_ASM_ADDR_PSEUDOS | MASK_MD_REORG_OPTIMIZATION | MASK_COND_EXEC_BEFORE_RELOAD) ++ (MASK_HAS_ASM_ADDR_PSEUDOS | MASK_MD_REORG_OPTIMIZATION) + + void + avr32_optimization_options (int level, diff --git a/packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2 b/packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2 Binary files differnew file mode 100644 index 0000000000..4be097b095 --- /dev/null +++ b/packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2 diff --git a/packages/gdb/gdb-avr32.inc b/packages/gdb/gdb-avr32.inc new file mode 100644 index 0000000000..0c0255fdb2 --- /dev/null +++ b/packages/gdb/gdb-avr32.inc @@ -0,0 +1,32 @@ +# Perform tasks required to use Atmel's AVR32 patches +# See http://avr32linux.org/twiki/bin/view/Main/GDBPatches for more info + + +do_avr32_reconf () { + if test ${TARGET_ARCH} == "avr32"; then + (cd ${S} && autoconf) || \ + die "failure running autoconf in top-level gdb" + + (cd ${S}/bfd && autoreconf) || \ + die "failure running autoreconf in bfd/" + + (cd ${S}/opcodes && autoreconf) || \ + die "failure running autoreconf in opcodes/" + fi + +} + + + +do_avr32_configure_bfd () { + if test ${TARGET_ARCH} == "avr32"; then + (cd ${B} && make configure-bfd) || die "Error running configure-bfd" + (cd ${B}/bfd && make headers) || \ + die "error running 'make headers' in bfd" + fi +} + + +addtask avr32_reconf after do_patch before do_configure +addtask avr32_configure_bfd after do_configure before do_compile + diff --git a/packages/gdb/gdb-cross.inc b/packages/gdb/gdb-cross.inc index 480cce4931..6d4c3d177e 100644 --- a/packages/gdb/gdb-cross.inc +++ b/packages/gdb/gdb-cross.inc @@ -10,6 +10,12 @@ do_configure () { # override this function to avoid the autoconf/automake/aclocal/autoheader # calls for now (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + + # Fix for issues when system's texinfo version >= 4.10 + # (See https://bugzilla.redhat.com/show_bug.cgi?id=345621) + sed -i -e "s@egrep 'texinfo.*'@egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|4.[1-9][0-9]+|[5-9])'@" '${S}/configure' + + oe_runconf } diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 9a66d7a94a..135e9c48d2 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25-omap1 -# Thu Apr 24 21:02:00 2008 +# Wed Apr 30 11:44:55 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -941,9 +941,10 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_COMMON=y -# CONFIG_VIDEO_V4L1 is not set +CONFIG_VIDEO_ALLOW_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set @@ -973,11 +974,21 @@ CONFIG_VIDEO_WM8775=m # # Video decoders # +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set # CONFIG_VIDEO_OV7670 is not set # CONFIG_VIDEO_TCM825X is not set # CONFIG_VIDEO_OV9640 is not set +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA7111 is not set +# CONFIG_VIDEO_SAA7114 is not set CONFIG_VIDEO_SAA711X=m +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_SAA7191 is not set # CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_VPX3220 is not set # # Video and audio decoders @@ -993,6 +1004,9 @@ CONFIG_VIDEO_CX2341X=m # Video encoders # # CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set # # Video improvement chips @@ -1000,22 +1014,39 @@ CONFIG_VIDEO_CX2341X=m # CONFIG_VIDEO_UPD64031A is not set # CONFIG_VIDEO_UPD64083 is not set CONFIG_VIDEO_VIVI=m +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_SAA5249=m +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_AU0828 is not set CONFIG_V4L_USB_DRIVERS=y CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR=y CONFIG_VIDEO_PVRUSB2_ONAIR_USB2=y CONFIG_VIDEO_PVRUSB2_SYSFS=y +# CONFIG_VIDEO_PVRUSB2_DVB is not set # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_EM28XX_ALSA=m +# CONFIG_VIDEO_EM28XX_DVB is not set CONFIG_VIDEO_USBVISION=m +# CONFIG_USB_VICAM is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_QUICKCAM_MESSENGER is not set CONFIG_USB_ET61X251=m +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_USB_W9968CF is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set CONFIG_USB_SN9C102=m +# CONFIG_USB_STV680 is not set CONFIG_USB_ZC0301=m +# CONFIG_USB_PWC is not set CONFIG_USB_ZR364XX=m CONFIG_USB_STKWEBCAM=m +# CONFIG_SOC_CAMERA is not set # CONFIG_RADIO_ADAPTERS is not set CONFIG_DVB_CORE=m CONFIG_DVB_CORE_ATTACH=y @@ -1094,6 +1125,7 @@ CONFIG_DVB_DIB3000MB=m CONFIG_DVB_DIB3000MC=m CONFIG_DVB_DIB7000M=m CONFIG_DVB_DIB7000P=m +# CONFIG_DVB_TDA10048 is not set # # DVB-C (cable) frontends @@ -1112,6 +1144,7 @@ CONFIG_DVB_OR51132=m CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m CONFIG_DVB_S5H1409=m +# CONFIG_DVB_AU8522 is not set # # Tuners/PLL support @@ -1126,11 +1159,13 @@ CONFIG_DVB_TUNER_MT2266=m CONFIG_DVB_TUNER_MT2131=m CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_TUNER_XC5000=m +# CONFIG_DVB_TUNER_ITD1000 is not set # # Miscellaneous devices # CONFIG_DVB_LNBP21=m +# CONFIG_DVB_ISL6405 is not set CONFIG_DVB_ISL6421=m CONFIG_DVB_TUA6100=m CONFIG_VIDEO_TUNER=m @@ -1263,10 +1298,6 @@ CONFIG_SND_USB_CAIAQ=m CONFIG_SND_SOC=y # -# SoC Audio support for SuperH -# - -# # ALSA SoC audio for Freescale SOCs # @@ -1312,7 +1343,7 @@ CONFIG_USB_SUSPEND=y # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD=m CONFIG_OMAP_EHCI_PHY_MODE=y # CONFIG_OMAP_EHCI_TLL_MODE is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y @@ -1434,7 +1465,7 @@ CONFIG_USB_LED=m # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set -CONFIG_USB_SISUSBVGA=y +CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set @@ -1638,7 +1669,6 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y -# CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set CONFIG_ROOT_NFS=y CONFIG_LOCKD=y diff --git a/packages/linux/linux-omap2-git/beagleboard/usb-timout.patch b/packages/linux/linux-omap2-git/beagleboard/usb-timout.patch new file mode 100644 index 0000000000..2d1797cb66 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/usb-timout.patch @@ -0,0 +1,11 @@ +--- /tmp/ehci-hub.c 2008-04-30 11:41:59.381876290 +0200 ++++ git/drivers/usb/host/ehci-hub.c 2008-04-30 11:42:20.522875367 +0200 +@@ -734,7 +734,7 @@ + * this bit; seems too long to spin routinely... + */ + retval = handshake(ehci, status_reg, +- PORT_RESET, 0, 750); ++ PORT_RESET, 0, 1250); + if (retval != 0) { + ehci_err (ehci, "port %d reset error %d\n", + wIndex + 1, retval); diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index f8c50f7c55..4a3c3faf01 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -2,16 +2,17 @@ require linux-omap.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}" -SRCREV = "b1224e0086dc0b27a5af1e7b4f59709521569060" +SRCREV = "59586cd959b31f91f29cf96c1d3f8ff52c3c0607" PV = "2.6.25+git${SRCREV}" -PR = "r5" +PR = "r6" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ - file://defconfig" + file://defconfig" SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ + file://usb-timout.patch;patch=1 \ " COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard" diff --git a/packages/madwifi/madwifi-ng_r1844-20061208.bb b/packages/madwifi/madwifi-ng_r1844-20061208.bb deleted file mode 100644 index 42d8ccafe4..0000000000 --- a/packages/madwifi/madwifi-ng_r1844-20061208.bb +++ /dev/null @@ -1,3 +0,0 @@ -PR = "r0" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2100-20070210.bb b/packages/madwifi/madwifi-ng_r2100-20070210.bb deleted file mode 100644 index 42d8ccafe4..0000000000 --- a/packages/madwifi/madwifi-ng_r2100-20070210.bb +++ /dev/null @@ -1,3 +0,0 @@ -PR = "r0" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2156-20070225.bb b/packages/madwifi/madwifi-ng_r2156-20070225.bb deleted file mode 100644 index 42d8ccafe4..0000000000 --- a/packages/madwifi/madwifi-ng_r2156-20070225.bb +++ /dev/null @@ -1,3 +0,0 @@ -PR = "r0" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2182-20070308.bb b/packages/madwifi/madwifi-ng_r2182-20070308.bb deleted file mode 100644 index 42d8ccafe4..0000000000 --- a/packages/madwifi/madwifi-ng_r2182-20070308.bb +++ /dev/null @@ -1,3 +0,0 @@ -PR = "r0" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2187-20070309.bb b/packages/madwifi/madwifi-ng_r2187-20070309.bb deleted file mode 100644 index 42d8ccafe4..0000000000 --- a/packages/madwifi/madwifi-ng_r2187-20070309.bb +++ /dev/null @@ -1,3 +0,0 @@ -PR = "r0" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2518-20070626.bb b/packages/madwifi/madwifi-ng_r2518-20070626.bb deleted file mode 100644 index 9f042ac926..0000000000 --- a/packages/madwifi/madwifi-ng_r2518-20070626.bb +++ /dev/null @@ -1,7 +0,0 @@ -PR = "r0" - -# Disable stripping of kernel modules, since this action strips too -# much out, and the resulting module won't load. -INHIBIT_PACKAGE_STRIP = "1" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2702-20070903.bb b/packages/madwifi/madwifi-ng_r2702-20070903.bb deleted file mode 100644 index 627d4f52b5..0000000000 --- a/packages/madwifi/madwifi-ng_r2702-20070903.bb +++ /dev/null @@ -1,13 +0,0 @@ -# Bitbake recipe for the madwifi-ng driver - -# Don't use this unless you know what you're doing -- this version does -# *NOT* build on BE kernels. - -# Disable stripping of kernel modules, since this action strips too -# much out, and the resulting module won't load. -INHIBIT_PACKAGE_STRIP = "1" - -require madwifi-ng_r.inc - -# PR set after the include, to override what's set in the included file. -PR = "r0" diff --git a/packages/madwifi/madwifi-ng_r3314-20080131.bb b/packages/madwifi/madwifi-ng_r3314-20080131.bb index d47a0959a8..fb5cde036f 100644 --- a/packages/madwifi/madwifi-ng_r3314-20080131.bb +++ b/packages/madwifi/madwifi-ng_r3314-20080131.bb @@ -1,8 +1,5 @@ # Bitbake recipe for the madwifi-ng driver -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_ixp4xx = "1" - # Disable stripping of kernel modules, since this action strips too # much out, and the resulting module won't load. INHIBIT_PACKAGE_STRIP = "1" diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 526f49bd13..80be619311 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r51" +PR = "r53" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -50,6 +50,7 @@ SLUGOS_PACKAGES = "\ bluez-utils \ bluez-hcidump \ bogofilter \ + bonnie++ \ boost \ bridge-utils \ bzip2 \ @@ -103,6 +104,7 @@ SLUGOS_PACKAGES = "\ hdparm \ ifupdown \ inetutils \ + iozone3 \ iperf \ ipkg-utils \ iptables \ diff --git a/packages/netbase/netbase/mpc8313e-rdb/.mtn2git_empty b/packages/netbase/netbase/mpc8313e-rdb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netbase/netbase/mpc8313e-rdb/.mtn2git_empty diff --git a/packages/netbase/netbase/mpc8313e-rdb/interfaces b/packages/netbase/netbase/mpc8313e-rdb/interfaces new file mode 100644 index 0000000000..64d65e3ad9 --- /dev/null +++ b/packages/netbase/netbase/mpc8313e-rdb/interfaces @@ -0,0 +1,16 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Wired interface +auto eth1 +iface eth1 inet dhcp + +# Wireless interface +auto ath0 +iface ath0 inet static + address 192.168.99.1 + netmask 255.255.255.0 + diff --git a/packages/opkg/opkg_svn.bb b/packages/opkg/opkg_svn.bb index 81401dda14..58aaf748ab 100644 --- a/packages/opkg/opkg_svn.bb +++ b/packages/opkg/opkg_svn.bb @@ -1,6 +1,6 @@ require opkg.inc -PR = "r3" +PR = "r4" PACKAGES =+ "libopkg-dev libopkg" @@ -12,7 +12,7 @@ FILES_libopkg = "${libdir}/*.so.*" OPKG_INIT_POSITION = "98" OPKG_INIT_POSITION_slugos = "41" -pkg_postinst_opkg () { +pkg_postinst_${PN} () { #!/bin/sh if [ "x$D" != "x" ]; then install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d @@ -26,7 +26,7 @@ fi update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 } -pkg_postrm_opkg () { +pkg_postrm_${PN} () { #!/bin/sh update-alternatives --remove opkg ${bindir}/opkg-cl } diff --git a/packages/u-boot/u-boot-1.3.2/.mtn2git_empty b/packages/u-boot/u-boot-1.3.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/u-boot-1.3.2/.mtn2git_empty diff --git a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-autoboot.patch b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-autoboot.patch new file mode 100644 index 0000000000..ffca5a35c7 --- /dev/null +++ b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-autoboot.patch @@ -0,0 +1,12 @@ +diff -urN u-boot-1.3.1.orig/include/configs/MPC8313ERDB.h u-boot-1.3.1/include/configs/MPC8313ERDB.h +--- u-boot-1.3.1.orig/include/configs/MPC8313ERDB.h 2007-12-06 10:21:19.000000000 +0100 ++++ u-boot-1.3.1/include/configs/MPC8313ERDB.h 2008-01-31 17:38:10.000000000 +0100 +@@ -522,7 +522,7 @@ + #define CONFIG_FDTFILE mpc8313erdb.dtb + + #define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +-#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */ ++#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */ + #define CONFIG_BAUDRATE 115200 + + #define XMK_STR(x) #x diff --git a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch new file mode 100644 index 0000000000..9071dfa419 --- /dev/null +++ b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch @@ -0,0 +1,35 @@ +diff -urN u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h u-boot-1.3.2/include/configs/MPC8313ERDB.h +--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h 2008-03-09 16:20:02.000000000 +0100 ++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h 2008-04-21 19:20:51.000000000 +0200 +@@ -179,7 +179,7 @@ + #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET + + /* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */ +-#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ ++#define CFG_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */ + #define CFG_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ + + /* +@@ -354,6 +354,7 @@ + #define CONFIG_CMD_PING + #define CONFIG_CMD_DHCP + #define CONFIG_CMD_I2C ++#define CONFIG_CMD_JFFS2 + #define CONFIG_CMD_MII + #define CONFIG_CMD_DATE + #define CONFIG_CMD_PCI +@@ -365,6 +366,14 @@ + + #define CONFIG_CMDLINE_EDITING 1 + ++/* ++ * JFFS2 partitions (mtdparts command line support) ++ */ ++#define CONFIG_JFFS2_CMDLINE ++#define CONFIG_JFFS2_NAND ++#define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=nand0" ++#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:384k(uboot),64k(env)" ++ + + /* + * Miscellaneous configurable options diff --git a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-nand.patch b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-nand.patch new file mode 100644 index 0000000000..e653b75fb9 --- /dev/null +++ b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-nand.patch @@ -0,0 +1,895 @@ +diff -urN u-boot-1.3.1.orig/board/freescale/mpc8313erdb/Makefile u-boot-1.3.1/board/freescale/mpc8313erdb/Makefile +--- u-boot-1.3.1.orig/board/freescale/mpc8313erdb/Makefile 2007-12-06 10:21:19.000000000 +0100 ++++ u-boot-1.3.1/board/freescale/mpc8313erdb/Makefile 2008-01-31 17:35:43.000000000 +0100 +@@ -25,7 +25,7 @@ + + LIB = $(obj)lib$(BOARD).a + +-COBJS := $(BOARD).o sdram.o ++COBJS := $(BOARD).o sdram.o nand.o + + SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) + OBJS := $(addprefix $(obj),$(COBJS)) +diff -urN u-boot-1.3.1.orig/board/freescale/mpc8313erdb/nand.c u-boot-1.3.1/board/freescale/mpc8313erdb/nand.c +--- u-boot-1.3.1.orig/board/freescale/mpc8313erdb/nand.c 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot-1.3.1/board/freescale/mpc8313erdb/nand.c 2008-01-31 17:35:26.000000000 +0100 +@@ -0,0 +1,868 @@ ++/* ++ * Copyright (C) Freescale Semiconductor, Inc. 2006. ++ * ++ * Initialized by Nick.Spence@freescale.com |