diff --git a/classes/nylon-image.bbclass b/classes/nylon-image.bbclass index 6d867ea..e973bf7 100644 --- a/classes/nylon-image.bbclass +++ b/classes/nylon-image.bbclass @@ -9,11 +9,10 @@ nylon_create_imgz() { # copy the kernel (for mips on flash) into tmp FLASH_BIN=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin - test -f ${FLASH_BIN} && \ cp ${FLASH_BIN} ${DEPLOY_DIR_IMAGE}/tmp/zImage.flash # copy rootfs.jffs (or so) into tmp - cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/tmp/rootfs.${type} + cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/tmp/rootfs.jffs2 # make an imgz out of tmp ( cd ${DEPLOY_DIR_IMAGE}/tmp; tar cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.imgz * ) diff --git a/classes/nylon-mirrors.bbclass b/classes/nylon-mirrors.bbclass index 02fddc0..11cc45c 100644 --- a/classes/nylon-mirrors.bbclass +++ b/classes/nylon-mirrors.bbclass @@ -1,6 +1,6 @@ MIRRORS_append () { -ftp://.*/.* http://meshcube.org/nylon/stable/sources/ -https?://.*/.* http://meshcube.org/nylon/stable/sources/ -ftp://.*/.* http://meshcube.org/nylon/unstable/sources/ -https?://.*/.* http://meshcube.org/nylon/unstable/sources/ +ftp://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/ +http://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/ +ftp://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/unstable/sources/ +http://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/unstable/sources/ } \ No newline at end of file diff --git a/conf/checksums.ini b/conf/checksums.ini index 42b4c86..3a2f170 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -26610,10 +26610,6 @@ sha256=76444692a94de4e6776a1bdf3b735e8f016bb374ae7c60496f8032fdc6085889 md5=f6c9b5c2b0f6919abd79f5fd059b01dc sha256=5beb94529cc7ac79b17e354f9b03aea311f5af17be5d48bc39e6f1db5059f70f -[http://meshcube.org/download/yamonenv_20060814.tgz] -md5=43c606bbd27c500b0022471ed704ab78 -sha256=014e744f40c773bf225328bce1ca80f5dde4835c1f6671e989a4f8c4ed24555f - [http://www.tortall.net/projects/yasm/releases/yasm-0.7.2.tar.gz] md5=cc9360593de5625dca286f0bfcb27dd5 sha256=2c4f916883cbaf5c177a3fd105c3180bd0f574c87d7215ecfbe5b087efcc0dd6 diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 8be99a3..a9185f9 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -45,7 +45,7 @@ SRCDATE_waimea ?= "20060814" SRCDATE_xcompmgr ?= "20060814" SRCDATE_xirssi ?= "20060814" SRCDATE_xsvg ?= "20060814" -SRCDATE_yamonenv ?= "20060814" +SRCDATE_yamonenv ?= "20051022" SRCDATE_zaurusd ?= "20060628" # Freedesktop.org diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 3d1f057..c0bfe0e 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -1,39 +1,131 @@ +############################################################################# #@TYPE: Distribution -#@NAME: Nylon Linux -#@DESCRIPTION: Distribution configuration for Nylon Mesh Linux distribution - -# this distribution is mainly for wireless networking devices and includes -# packages necessary for wireless LAN access point, routing, encryption and -# especially mesh routing applications -# -# it is primarily aimed at the 4G Systems MeshCube (mtx-1) and other -# mipsel based platforms +#@NAME: Minimal +#@DESCRIPTION: Embedded Linux Distribution Configuration # -# Bruno Randolf - -TARGET_OS = "linux" - -INHERIT += "package_ipk debian nylon-mirrors" -INHERIT += "linux-kernel-base" +#@COMMENT: This distribution configuration can serve as a starting point for +#@COMMENT: the integration of new target platforms, machines, or distributions. +############################################################################# + +############################################################################# +# NAME and VERSION +############################################################################# +DISTRO_NAME = "nylon" +#DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" +DISTRO_VERSION = "${NYLON_VERSION}" +BUILDNAME := "${NYLON_VERSION}" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" +TARGET_FPU = "soft" +SRCDATE := "20050527" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -PREFERRED_PROVIDERS += " virtual/libx11:diet-x11" -PREFERRED_PROVIDERS += " python:python-curses" +# this no longer used? +# use meshcub.org mirrors for CVS sources +#CVS_TARBALL_STASH = "http://download.berlin.freifunk.net/meshcube.org/nylon/${NYLON_RELEASE}/sources/" +# +#export FEED_URIS = " \ +# nylon##http://http://download.berlin.freifunk.net/meshcube.org/nylon/${NYLON_RELEASE}/feed \ +# nylon-bin##http://http://download.berlin.freifunk.net/meshcube.org/nylon/${NYLON_RELEASE}/binary-feed" + +# Ensure some form of release config, so error out if someone thinks he knows better +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION") + +############################################################################# +# FEATURE SELECTION +############################################################################# +# Use bluetooth 4.0 +DISTRO_BLUETOOTH_MANAGER = "bluez4" +# We want images supporting the following features (for task-base) +DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat pcmcia usbgadget usbhost pci" + +############################################################################# +# LIBRARY NAMES +############################################################################# +# libfoo -> libfoo0-2 (etc) +INHERIT += "debian" + +############################################################################# +# STAGING AREA +############################################################################# +# Controlled by packaging system +INHERIT += "packaged-staging" + +############################################################################# +# PACKAGING & FEEDS +############################################################################# +# Chose the packaging system +INHERIT += "package_ipk nylon-mirrors linux-kernel-base" +IMAGE_FSTYPES ?= "tar.gz jffs2" + +require conf/distro/include/sane-feed.inc +PREFERRED_PKG_FORMAT ?= "ipk" +require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc + +# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run +IPKG_VARIANT = "opkg-nogpg" + +############################################################################# +# IMAGES +############################################################################# +# Name the generated images in a sane way +#IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" +KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" +CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}" +DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" + +############################################################################# +# KERNEL +############################################################################# +KERNEL = "kernel24" +MACHINE_KERNEL_VERSION = "2.4" + +############################################################################# +# TOOLCHAIN +############################################################################# +PREFERRED_LIBC = "glibc" +require conf/distro/include/sane-toolchain.inc +fixedCxxflags = "${@bb.data.getVar('CXXFLAGS', d, 1).replace('-fvisibility-inlines-hidden','')}" +CXXFLAGS := ${fixedCxxflags} + +############################################################################# +# OVERWRITES adjusted from bitbake.conf to feature the MACHINE_CLASS +############################################################################# +OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + +############################################################################# +# PREFERRED PROVIDERS +############################################################################# +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" +PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}g++ = "gcc-cross" +#PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" +PREFERRED_PROVIDERS_python = "python-curses" PREFERRED_PROVIDER_classpath = "classpath-minimal" -TARGET_FPU = "soft" +PREFERRED_PROVIDER_virtual/kernel_mtx-1 = "linux-mtx-1" +PREFERRED_PROVIDER_virtual/kernel_mtx-2 = "linux-mtx-2" +PREFERRED_PROVIDER_virtual/kernel_mtx-3 = "linux-mtx-3" +PREFERRED_PROVIDER_virtual/kernel_mtx-3a = "linux-mtx-3a" -SRCDATE := "20050527" +############################################################################# +# PREFERRED VERSIONS +############################################################################# +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc PREFERRED_VERSION_glibc = "2.3.3" +PREFERRED_VERSION_glibc-initial = "2.3.2" PREFERRED_VERSION_shorewall = "2.0.9-monolithic" PREFERRED_VERSION_ppp-dsl = "0.1-monolithic" -PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20060223" +PREFERRED_VERSION_mtd-utils = "1.0.0+git" PREFERRED_VERSION_kismet = "2005-01-R1" +PREFERRED_VERSION_automake-native = "1.10" +PREFERRED_VERSION_pkgconfig-native = "0.23" +PREFERRED_VERSION_netperf = "2.3" PREFERRED_VERSION_gcc-cross-initial = "3.3.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.3.4" @@ -44,67 +136,66 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7" PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7" PREFERRED_VERSION_binutils = "2.16" PREFERRED_VERSION_linux-libc-headers = "2.6.18" - PREFERRED_VERSION_prism54-firmware = "1.0.3.0" +#PREFERRED_VERSION_udev = "089" +PREFERRED_VERSION_udev = "100" +PREFERRED_VERSION_madwifi-modules = "0.9.3" +PREFERRED_VERSION_madwifi-tools = "0.9.3" KERNEL_VERSION_mtx-1 = "2.4.27" KERNEL_VERSION_mtx-2 = "2.4.27" +# begin overrides mtx-3 #PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627" PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4" PREFERRED_VERSION_gcc-cross-intermediate_mtx-3 = "3.4.4" PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4" PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4" PREFERRED_VERSION_gcc_mtx-3 = "3.4.4" -### did not compile with: -#PREFERRED_VERSION_binutils-cross_mtx-3 = "2.16.91.0.7" -#PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.16.91.0.7" -### falling back to: PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1" PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1" PREFERRED_VERSION_binutils_mtx-3 = "2.16" -PREFERRED_VERSION_madwifi-modules = "0.9.3" -PREFERRED_VERSION_madwifi-tools = "0.9.3" - -PREFERRED_VERSION_udev = "089" - KERNEL_VERSION_mtx-3 = "2.6.15.4" -PREFERRED_PROVIDER_virtual/kernel_mtx-3a = "linux-mtx-3a" - +# begin overrides mtx-3a #PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627" PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4" PREFERRED_VERSION_gcc-cross-intermediate_mtx-3a = "3.4.4" PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4" PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4" PREFERRED_VERSION_gcc_mtx-3a = "3.4.4" -### did not compile with: -#PREFERRED_VERSION_binutils-cross_mtx-3a = "2.16.91.0.7" -#PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.16.91.0.7" -### falling back to: PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1" PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1" PREFERRED_VERSION_binutils_mtx-3a = "2.16" - -PREFERRED_VERSION_udev = "100" - KERNEL_VERSION_mtx-3a = "2.6.16.6" -# usually overrrided from local.conf -NYLON_RELEASE = "unstable" - -# use meshcub.org mirrors for CVS sources -CVS_TARBALL_STASH = "http://meshcube.org/nylon/${NYLON_RELEASE}/sources/" - -export FEED_URIS = " \ - nylon##http://meshcube.org/nylon/${NYLON_RELEASE}/feed \ - nylon-bin##http://meshcube.org/nylon/${NYLON_RELEASE}/binary-feed" - -# image names -DISTRO_VERSION = "${NYLON_VERSION}" -BUILDNAME := "${NYLON_VERSION}" -#this does not work: ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')} -IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" -KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" - +############################################################################# +# CONTENTS +############################################################################# + +# Ship extra debug utils in the rootfs when doing a debug build +DISTRO_EXTRA_APPS ?= "" +DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}' + +# Additional content I (only valid if you include task-base) +# distro-feed-configs: configuration files for the online feeds +# util-linux-ng-mount util-linux-ng-umount: busybox mount is broken +# angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink +DISTRO_EXTRA_RDEPENDS += "\ + distro-feed-configs \ + util-linux-ng-mount util-linux-ng-umount \ + angstrom-libc-fixup-hack \ + ${DISTRO_EXTRA_APPS} \ +" + +# Additional content II (can be masked with BAD_RECOMMENDS) +DISTRO_EXTRA_RRECOMMENDS += " \ + kernel-module-vfat \ + kernel-module-ext2 \ + kernel-module-ext3 \ + kernel-module-af-packet \ + avahi-daemon \ + avahi-autoipd \ + openssh-sftp-server \ +" diff --git a/recipes/binutils/binutils-cross.inc b/recipes/binutils/binutils-cross.inc index 384d18c..690dd66 100644 --- a/recipes/binutils/binutils-cross.inc +++ b/recipes/binutils/binutils-cross.inc @@ -7,6 +7,9 @@ EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \ --program-prefix=${TARGET_PREFIX} \ --enable-install-libbfd \ --disable-werror" +#EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \ +# --enable-install-libbfd \ +# --disable-werror" do_stage () { oe_runmake install diff --git a/recipes/binutils/binutils_2.14.90.0.7.bb b/recipes/binutils/binutils_2.14.90.0.7.bb index f940c87..3b2ab46 100644 --- a/recipes/binutils/binutils_2.14.90.0.7.bb +++ b/recipes/binutils/binutils_2.14.90.0.7.bb @@ -47,7 +47,8 @@ SRC_URI = \ file://binutils-uclibc-210-cflags.patch;patch=1 \ file://binutils-100_cflags_for_build.patch;patch=1 \ file://plt32trunc.patch;patch=1 \ - file://600-arm-textrel.patch;patch=1" + file://600-arm-textrel.patch;patch=1 \ + file://binutils-2.14.90.0.7-fix-broken-configure.patch;patch=1" S = "${WORKDIR}/binutils-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" diff --git a/recipes/chillispot/chillispot_1.0RC3.bb b/recipes/chillispot/chillispot_1.0RC3.bb index b4338a0..f7b21a9 100644 --- a/recipes/chillispot/chillispot_1.0RC3.bb +++ b/recipes/chillispot/chillispot_1.0RC3.bb @@ -1,7 +1,8 @@ DESCRIPTION = "ChilliSpot is an open source captive portal or wireless LAN access point controller. It is used for authenticating users of a wireless LAN." HOMEPAGE = "http://www.chillispot.org/" LICENSE = "GPL" -SRC_URI = "http://www.chillispot.org/download/chillispot-${PV}.tar.gz \ +#SRC_URI = "http://www.chillispot.org/download/chillispot-${PV}.tar.gz +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/chillispot-${PV}.tar.gz \ file://no-ansi.patch;patch=1 \ file://init" RDEPENDS = "kernel-module-tun" diff --git a/recipes/elvis/elvis_2.2.0.bb b/recipes/elvis/elvis_2.2.0.bb index c0f9262..f038c6b 100644 --- a/recipes/elvis/elvis_2.2.0.bb +++ b/recipes/elvis/elvis_2.2.0.bb @@ -4,8 +4,7 @@ PRIORITY = "optional" LICENSE = "Perl Clarified Artistic License" DEPENDS = "ncurses" -#SRC_URI = "ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz" -SRC_URI = "http://www.fh-wedel.de/pub/elvis/elvis-2.2_0.tar.gz" +SRC_URI = "ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz" S = "${WORKDIR}/elvis-2.2_0" CFLAGS_prepend = " -I. -Iosunix -L${STAGING_LIBDIR} " diff --git a/recipes/glibc/glibc_2.3.2.bb b/recipes/glibc/glibc_2.3.2.bb index 891d9da..a66b7fe 100644 --- a/recipes/glibc/glibc_2.3.2.bb +++ b/recipes/glibc/glibc_2.3.2.bb @@ -103,6 +103,11 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ file://etc/ld.so.conf \ file://generate-supported.mk" +SRC_URI_append_mtx-1 = " file://mips-abio32.patch;patch=1 \ + file://allow-gcc.patch;patch=1 " +SRC_URI_append_mtx-2 = " file://mips-abio32.patch;patch=1 \ + file://allow-gcc.patch;patch=1 " + S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" diff --git a/recipes/glibc/glibc_2.3.3.bb b/recipes/glibc/glibc_2.3.3.bb index 03711f7..2b034ba 100644 --- a/recipes/glibc/glibc_2.3.3.bb +++ b/recipes/glibc/glibc_2.3.3.bb @@ -48,6 +48,11 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ file://etc/ld.so.conf \ file://generate-supported.mk" +SRC_URI_append_mtx-1 = " file://mips-abio32.patch;patch=1 \ + file://allow-gcc.patch;patch=1 " +SRC_URI_append_mtx-2 = " file://mips-abio32.patch;patch=1 \ + file://allow-gcc.patch;patch=1 " + S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" diff --git a/recipes/gnutls/gnutls.inc b/recipes/gnutls/gnutls.inc index e438423..004161a 100644 --- a/recipes/gnutls/gnutls.inc +++ b/recipes/gnutls/gnutls.inc @@ -1,6 +1,6 @@ DESCRIPTION = "GNU Transport Layer Security Library" HOMEPAGE = "http://www.gnu.org/software/gnutls/" -DEPENDS = "zlib libgcrypt lzo" +DEPENDS = "zlib libgcrypt lzo guile-native" LICENSE = "LGPL" SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2" diff --git a/recipes/hostap/hostap-daemon_0.4.4.bb b/recipes/hostap/hostap-daemon_0.4.4.bb index bece7d1..83a5386 100644 --- a/recipes/hostap/hostap-daemon_0.4.4.bb +++ b/recipes/hostap/hostap-daemon_0.4.4.bb @@ -1,3 +1,7 @@ require hostap-daemon.inc +SRC_URI_append_nylon = "\ + file://hostap-no-bsd.patch;patch=1" + + PR = "r2" diff --git a/recipes/hostap/hostap-daemon_0.5.10.bb b/recipes/hostap/hostap-daemon_0.5.10.bb index 3fc1d8d..ea49301 100644 --- a/recipes/hostap/hostap-daemon_0.5.10.bb +++ b/recipes/hostap/hostap-daemon_0.5.10.bb @@ -5,6 +5,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" PR = "r1" +DEPENDS_append_mtx-1 = " madwifi-modules" +DEPENDS_append_mtx-2 = " madwifi-modules" +CPPFLAGS_append_mtx-1 = " -I${STAGING_INCDIR}/madwifi/" +CPPFLAGS_append_mtx-2 = " -I${STAGING_INCDIR}/madwifi/" #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds MY_ARCH := "${PACKAGE_ARCH}" diff --git a/recipes/images/nylon-image-base.bb b/recipes/images/nylon-image-base.bb index 27dc165..ac9d81a 100644 --- a/recipes/images/nylon-image-base.bb +++ b/recipes/images/nylon-image-base.bb @@ -1,25 +1,37 @@ inherit image inherit nylon-image +IMAGE_FSTYPES = "jffs2 tar.gz" + export IMAGE_BASENAME = "nylon-base" NYLON_BASE = "base-files base-passwd bash busybox \ ipkg initscripts less \ + madwifi-modules \ mtd-utils \ + nylon-scripts \ nano ncurses netbase \ - openssh sysvinit \ - tzdata tinylogin udev" + openssh \ + pciutils \ + sysvinit \ + tinylogin \ + tzdata \ + usbutils \ + wireless-tools wlan-ng-utils" DEPENDS += "virtual/kernel less nano" -IMAGE_INSTALL = "kernel less nano elvis-tiny \ - ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" ## kernel 2.4 ## -RDEPENDS_append_mtx-1 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" -RDEPENDS_append_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" +NYLON_IMAGE_RDEPENDS_mtx-1 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" +NYLON_IMAGE_RDEPENDS_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" ## kernel 2.6 ## -RDEPENDS_append_mtx-3 = " module-init-tools udev" -RDEPENDS_append_mtx-3a = " module-init-tools" +NYLON_IMAGE_RDEPENDS_mtx-3 = " module-init-tools udev" +NYLON_IMAGE_RDEPENDS_mtx-3a = " module-init-tools" + +RDEPENDS_append = ${NYLON_IMAGE_RDEPENDS} + +IMAGE_INSTALL = "kernel less nano elvis-tiny \ + ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS} ${NYLON_IMAGE_RDEPENDS}" IMAGE_LINGUAS = "" diff --git a/recipes/images/nylon-image-standard.bb b/recipes/images/nylon-image-standard.bb index 5f79402..e865534 100644 --- a/recipes/images/nylon-image-standard.bb +++ b/recipes/images/nylon-image-standard.bb @@ -3,15 +3,21 @@ require nylon-image-base.bb export IMAGE_BASENAME = "nylon-standard" NYLON_STANDARD = "\ - hostap-utils \ + dnsmasq \ + hostap-daemon hostap-utils \ linux-hotplug \ ifplugd \ + iproute2 \ + madwifi-modules \ + nylon-config \ olsrd \ ppp \ rp-pppoe \ - shorewall \ + simple-firewall \ tcpdump \ - wpa-supplicant" + usbutils \ + wpa-supplicant \ + yamonenv" DEPENDS += "hostap-modules ntp \ ${NYLON_STANDARD}" diff --git a/recipes/libusb/libusb-compat_0.1.0.bb b/recipes/libusb/libusb-compat_0.1.0.bb index 8877651..4869440 100644 --- a/recipes/libusb/libusb-compat_0.1.0.bb +++ b/recipes/libusb/libusb-compat_0.1.0.bb @@ -11,7 +11,8 @@ DEPENDS = "libusb1" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ " - +SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1 \ +" inherit autotools pkgconfig binconfig lib_package PARALLEL_MAKE = "" diff --git a/recipes/libusb/libusb1_1.0.0.bb b/recipes/libusb/libusb1_1.0.0.bb index 8450a7c..978d819 100644 --- a/recipes/libusb/libusb1_1.0.0.bb +++ b/recipes/libusb/libusb1_1.0.0.bb @@ -9,6 +9,8 @@ PR = "r0" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ " +SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1 \ +" S = "${WORKDIR}/libusb-${PV}" inherit autotools pkgconfig binconfig lib_package diff --git a/recipes/linux-hotplug/linux-hotplug_20040920.bb b/recipes/linux-hotplug/linux-hotplug_20040920.bb index 6209504..5cab3b8 100644 --- a/recipes/linux-hotplug/linux-hotplug_20040920.bb +++ b/recipes/linux-hotplug/linux-hotplug_20040920.bb @@ -27,7 +27,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20 file://sysconfig-usb \ file://isapnp-exit.diff;patch=1 \ file://usb-storage \ - file://soc.agent" + file://soc.agent \ + file://hotplug-binary-path.patch;patch=1" SRC_URI_append_openzaurus = " file://quiet-pci.patch;patch=1" diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb index d71b68a..f898d70 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.18.bb @@ -70,8 +70,10 @@ do_stage () { do_stage_append_nylon () { cp -pPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/ + install -d ${CROSS_DIR}/${TARGET_SYS}/include/asm/ cp -pPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/ cp -pPR include/linux/* ${STAGING_INCDIR}/linux/ + install -d ${CROSS_DIR}/${TARGET_SYS}/include/linux/ cp -pPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/ } diff --git a/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch b/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch index 4e8a757..e2b8521 100644 --- a/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch +++ b/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch @@ -1,6 +1,15 @@ diff -Naru linux/arch/mips/Makefile linux.spi/arch/mips/Makefile --- linux/arch/mips/Makefile 2004-05-06 15:23:41.000000000 -0400 +++ linux.spi/arch/mips/Makefile 2004-05-11 23:19:24.000000000 -0400 +@@ -17,7 +17,7 @@ + # Select the object file format to substitute into the linker script. + # + ifdef CONFIG_CPU_LITTLE_ENDIAN +-tool-prefix = mipsel-linux- ++tool-prefix = mipsel-oe-linux- + ld-emul = elf32ltsmip + else + tool-prefix = mips-linux- @@ -29,6 +29,8 @@ endif diff --git a/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff b/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff index bfc1af9..1651bd5 100644 --- a/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff +++ b/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff @@ -1,5 +1,5 @@ ---- linux-2.4.27-mtx1/drivers/usb/serial/usbserial.c 2005-08-28 20:23:40.000000000 +0200 -+++ linux-2.4.27-mtx1/drivers/usb/serial/usbserial.c 2005-08-28 20:23:12.000000000 +0200 +--- linux-old/drivers/usb/serial/usbserial.c 2005-08-28 20:23:40.000000000 +0200 ++++ linux/drivers/usb/serial/usbserial.c 2005-08-28 20:23:12.000000000 +0200 @@ -499,6 +499,19 @@ /* get_usb_serial checks port->tty, so cannot be used */ serial = port->serial; diff --git a/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff b/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff index e615a92..9169005 100644 --- a/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff +++ b/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff @@ -1,5 +1,53 @@ ---- linux/drivers/usb/serial/usbserial.c~33-usbserial-bulk_in_size-4096.diff 2006-03-31 15:05:46.674445000 +0200 -+++ linux/drivers/usb/serial/usbserial.c 2006-04-07 12:23:56.970400500 +0200 +--- linux/drivers/usb/acm.c.orig 2006-04-07 13:56:33.837683000 +0200 ++++ linux/drivers/usb/acm.c 2006-04-07 12:14:37.995466750 +0200 +@@ -155,6 +155,11 @@ + unsigned char clocal; /* termios CLOCAL */ + }; + ++/* global params controlling max sizes for read, write, control */ ++static int maxszr = 0; ++static int maxszw = 0; ++static int maxszc = 0; ++ + static struct usb_driver acm_driver; + static struct tty_driver acm_tty_driver; + static struct acm *acm_table[ACM_TTY_MINORS]; +@@ -573,9 +578,13 @@ + } + memset(acm, 0, sizeof(struct acm)); + +- ctrlsize = epctrl->wMaxPacketSize; +- readsize = epread->wMaxPacketSize; +- acm->writesize = epwrite->wMaxPacketSize; ++ ctrlsize = (epctrl->wMaxPacketSize > maxszc)? ++ epctrl->wMaxPacketSize: maxszc; ++ readsize = (epread->wMaxPacketSize > maxszr)? ++ epread->wMaxPacketSize: maxszr; ++ acm->writesize = (epwrite->wMaxPacketSize > maxszw)? ++ epwrite->wMaxPacketSize: maxszw; ++ + acm->iface = cfacm->interface + j; + acm->minor = minor; + acm->dev = dev; +@@ -740,6 +749,16 @@ + module_init(acm_init); + module_exit(acm_exit); + ++ ++MODULE_PARM(maxszr, "i"); ++MODULE_PARM_DESC(maxszr, "User specified USB endpoint read size"); ++ ++MODULE_PARM(maxszw, "i"); ++MODULE_PARM_DESC(maxszw, "User specified USB endpoint write size"); ++ ++MODULE_PARM(maxszc, "i"); ++MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size"); ++ + MODULE_AUTHOR( DRIVER_AUTHOR ); + MODULE_DESCRIPTION( DRIVER_DESC ); + MODULE_LICENSE("GPL"); +--- linux/drivers/usb/serial/usbserial.c-orig 2009-02-27 23:34:48.000000000 +0100 ++++ linux/drivers/usb/serial/usbserial.c 2009-02-27 23:34:54.000000000 +0100 @@ -332,6 +332,9 @@ static __u16 vendor = 0x05f9; static __u16 product = 0xffff; @@ -7,7 +55,7 @@ +static int count_smaller64 = 0; +static int count_bigger64 = 0; + - static struct usb_device_id generic_device_ids[5]; /* Initially all zeroes. */ + static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ /* All of the device info needed for the Generic Serial Converter */ @@ -396,6 +399,10 @@ @@ -66,7 +114,7 @@ port->interrupt_in_endpointAddress = endpoint->bEndpointAddress; port->interrupt_in_buffer = kmalloc (buffer_size, GFP_KERNEL); if (!port->interrupt_in_buffer) { -@@ -1807,6 +1825,7 @@ +@@ -1798,6 +1816,7 @@ static void __exit usb_serial_exit(void) { @@ -74,7 +122,7 @@ #ifdef CONFIG_USB_SERIAL_GENERIC /* remove our generic driver */ -@@ -1874,6 +1893,15 @@ +@@ -1865,6 +1884,15 @@ MODULE_PARM(debug, "i"); MODULE_PARM_DESC(debug, "Debug enabled or not"); @@ -90,51 +138,3 @@ #ifdef CONFIG_USB_SERIAL_GENERIC MODULE_PARM(vendor, "h"); MODULE_PARM_DESC(vendor, "User specified USB idVendor"); ---- linux/drivers/usb/acm.c.orig 2006-04-07 13:56:33.837683000 +0200 -+++ linux/drivers/usb/acm.c 2006-04-07 12:14:37.995466750 +0200 -@@ -155,6 +155,11 @@ - unsigned char clocal; /* termios CLOCAL */ - }; - -+/* global params controlling max sizes for read, write, control */ -+static int maxszr = 0; -+static int maxszw = 0; -+static int maxszc = 0; -+ - static struct usb_driver acm_driver; - static struct tty_driver acm_tty_driver; - static struct acm *acm_table[ACM_TTY_MINORS]; -@@ -573,9 +578,13 @@ - } - memset(acm, 0, sizeof(struct acm)); - -- ctrlsize = epctrl->wMaxPacketSize; -- readsize = epread->wMaxPacketSize; -- acm->writesize = epwrite->wMaxPacketSize; -+ ctrlsize = (epctrl->wMaxPacketSize > maxszc)? -+ epctrl->wMaxPacketSize: maxszc; -+ readsize = (epread->wMaxPacketSize > maxszr)? -+ epread->wMaxPacketSize: maxszr; -+ acm->writesize = (epwrite->wMaxPacketSize > maxszw)? -+ epwrite->wMaxPacketSize: maxszw; -+ - acm->iface = cfacm->interface + j; - acm->minor = minor; - acm->dev = dev; -@@ -740,6 +749,16 @@ - module_init(acm_init); - module_exit(acm_exit); - -+ -+MODULE_PARM(maxszr, "i"); -+MODULE_PARM_DESC(maxszr, "User specified USB endpoint read size"); -+ -+MODULE_PARM(maxszw, "i"); -+MODULE_PARM_DESC(maxszw, "User specified USB endpoint write size"); -+ -+MODULE_PARM(maxszc, "i"); -+MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size"); -+ - MODULE_AUTHOR( DRIVER_AUTHOR ); - MODULE_DESCRIPTION( DRIVER_DESC ); - MODULE_LICENSE("GPL"); diff --git a/recipes/linux/linux-mtx-1_2.4.27.bb b/recipes/linux/linux-mtx-1_2.4.27.bb index 5815a57..6dd7121 100644 --- a/recipes/linux/linux-mtx-1_2.4.27.bb +++ b/recipes/linux/linux-mtx-1_2.4.27.bb @@ -35,7 +35,11 @@ SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_ file://26-usbd-amd-pb1x00-kit-23may2003-update.diff;patch=1 \ file://27-usbd-amd-pb1x00-kit-23may2003-usbd.diff;patch=1 \ file://29-au1000-pci-config-clear-errors.diff;patch=1 \ + file://32-usbserial-stalled-hack.diff;patch=1 \ + file://33-usbserial-bulk_in_size-4096.diff;patch=1 \ file://42-usb-ohci-fixes.patch;patch=1 \ + file://43-usbserial-27-32-backport.diff;patch=1 \ + file://45-acm-tty-and-sb2.patch;patch=1 \ file://48-pptp.patch;patch=1 \ file://defconfig-mtx-1" @@ -74,8 +78,8 @@ fi FILES_kernel += " /tmp" do_deploy() { - install -d ${DEPLOY_DIR}/images - install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.bin - install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec - install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec + install -d 0755 ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin + install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.srec + install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.ram.srec } diff --git a/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch b/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch index 48495b5..5756988 100644 --- a/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch +++ b/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch @@ -1,6 +1,15 @@ diff -Naru linux/arch/mips/Makefile linux.spi/arch/mips/Makefile --- linux/arch/mips/Makefile 2004-05-06 15:23:41.000000000 -0400 +++ linux.spi/arch/mips/Makefile 2004-05-11 23:19:24.000000000 -0400 +@@ -17,7 +17,7 @@ + # Select the object file format to substitute into the linker script. + # + ifdef CONFIG_CPU_LITTLE_ENDIAN +-tool-prefix = mipsel-linux- ++tool-prefix = mipsel-oe-linux- + ld-emul = elf32ltsmip + else + tool-prefix = mips-linux- @@ -29,6 +29,8 @@ endif diff --git a/recipes/linux/linux-mtx-2_2.4.27.bb b/recipes/linux/linux-mtx-2_2.4.27.bb index 66ce06c..5b26903 100644 --- a/recipes/linux/linux-mtx-2_2.4.27.bb +++ b/recipes/linux/linux-mtx-2_2.4.27.bb @@ -86,8 +86,8 @@ fi FILES_kernel += " /tmp" do_deploy() { - install -d ${DEPLOY_DIR}/images - install -m 0644 arch/mips/zboot/images/mtx-2.flash.bin ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.bin - install -m 0644 arch/mips/zboot/images/mtx-2.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec - install -m 0644 arch/mips/zboot/images/mtx-2.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec + install -d 0755 ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/mips/zboot/images/mtx-2.flash.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin + install -m 0644 arch/mips/zboot/images/mtx-2.flash.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.srec + install -m 0644 arch/mips/zboot/images/mtx-2.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.ram.srec } diff --git a/recipes/logrotate-script/logrotate-script_cvs.bb b/recipes/logrotate-script/logrotate-script_cvs.bb index a46b265..2c6fd90 100644 --- a/recipes/logrotate-script/logrotate-script_cvs.bb +++ b/recipes/logrotate-script/logrotate-script_cvs.bb @@ -4,7 +4,7 @@ SECTION = "admin" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI = "http://meshcube.org/download/logrotate_${SRCDATE}.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/logrotate_${SRCDATE}.tgz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/recipes/meta/nylon-feed.inc b/recipes/meta/nylon-feed.inc index d7b83e8..f20bcec 100644 --- a/recipes/meta/nylon-feed.inc +++ b/recipes/meta/nylon-feed.inc @@ -36,6 +36,7 @@ ncurses \ netbase \ netperf \ ntp \ +nylon-config \ nylon-scripts \ nylon-statistics \ olsrd \ @@ -48,7 +49,7 @@ ppp \ pptp-linux \ rrdtool \ ser \ -shorewall \ +simple-firewall \ stunnel \ sysvinit \ tcl \ diff --git a/recipes/mobilemesh/mobilemesh_1.2.bb b/recipes/mobilemesh/mobilemesh_1.2.bb index df8f2f9..ebedf2d 100644 --- a/recipes/mobilemesh/mobilemesh_1.2.bb +++ b/recipes/mobilemesh/mobilemesh_1.2.bb @@ -3,7 +3,7 @@ DESCRIPTION = "MobileMesh mobile ad-hoc routing protocol" HOMEPAGE = "http://www.mitre.org/work/tech_transfer/mobilemesh/" LICENSE = "GPL" DEPENDS = "openssl" -SRC_URI = "http://meshcube.org/download/mobilemesh_1.2.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/mobilemesh_1.2.tgz" PR = "r1" S = "${WORKDIR}/mobilemesh" diff --git a/recipes/netbase/netbase/mtx-1/interfaces b/recipes/netbase/netbase/mtx-1/interfaces index a7c6da5..ae50a5c 100644 --- a/recipes/netbase/netbase/mtx-1/interfaces +++ b/recipes/netbase/netbase/mtx-1/interfaces @@ -1,24 +1,34 @@ # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) -# The loopback interface +# the loopback interface auto lo iface lo inet loopback -# Ethernet +# ethernet auto eth0 iface eth0 inet dhcp + alias conf 192.168.0.250 -# wlan interface 1 for clients -auto wlan0 +# auto is not needed for the wlan interfaces +# - hotplug will ifup the interfaces automatically + +# first wlan interface for clients iface wlan0 inet static address 10.0.0.1 netmask 255.0.0.0 wireless_mode master wireless_essid cube-ap wireless_channel 1 - -# wlan interface 2 for mesh -auto wlan1 + +iface ath0 inet static + address 10.0.0.1 + netmask 255.0.0.0 + wireless_standard g + wireless_mode master + wireless_essid cube-ap + wireless_channel 1 + +# second wlan interface for mesh iface wlan1 inet static address 172.16.0.1 netmask 255.240.0.0 @@ -27,3 +37,12 @@ iface wlan1 inet static wireless_essid cube-mesh wireless_channel 11 wireless_rts 250 + +iface ath1 inet static + address 172.16.0.1 + netmask 255.240.0.0 + broadcast 172.31.255.255 + wireless_mode ad-hoc + wireless_essid cube-mesh + wireless_channel 11 + wireless_rts 250 diff --git a/recipes/netbase/netbase/mtx-2/interfaces b/recipes/netbase/netbase/mtx-2/interfaces index a7c6da5..ae50a5c 100644 --- a/recipes/netbase/netbase/mtx-2/interfaces +++ b/recipes/netbase/netbase/mtx-2/interfaces @@ -1,24 +1,34 @@ # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) -# The loopback interface +# the loopback interface auto lo iface lo inet loopback -# Ethernet +# ethernet auto eth0 iface eth0 inet dhcp + alias conf 192.168.0.250 -# wlan interface 1 for clients -auto wlan0 +# auto is not needed for the wlan interfaces +# - hotplug will ifup the interfaces automatically + +# first wlan interface for clients iface wlan0 inet static address 10.0.0.1 netmask 255.0.0.0 wireless_mode master wireless_essid cube-ap wireless_channel 1 - -# wlan interface 2 for mesh -auto wlan1 + +iface ath0 inet static + address 10.0.0.1 + netmask 255.0.0.0 + wireless_standard g + wireless_mode master + wireless_essid cube-ap + wireless_channel 1 + +# second wlan interface for mesh iface wlan1 inet static address 172.16.0.1 netmask 255.240.0.0 @@ -27,3 +37,12 @@ iface wlan1 inet static wireless_essid cube-mesh wireless_channel 11 wireless_rts 250 + +iface ath1 inet static + address 172.16.0.1 + netmask 255.240.0.0 + broadcast 172.31.255.255 + wireless_mode ad-hoc + wireless_essid cube-mesh + wireless_channel 11 + wireless_rts 250 diff --git a/recipes/nylon/nylon-scripts_cvs.bb b/recipes/nylon/nylon-scripts_cvs.bb index 650bd1a..02b8236 100644 --- a/recipes/nylon/nylon-scripts_cvs.bb +++ b/recipes/nylon/nylon-scripts_cvs.bb @@ -4,12 +4,13 @@ DEPENDS = "hostap-utils" SECTION = "base" PRIORITY = "optional" LICENSE = "GPLv2" -SRCDATE = "20060923" +#SRCDATE = "20060923" +SRCDATE = "20051022" PV = "1.0.0+cvs${SRCDATE}" PR = "r2" RDEPENDS = "bash" -SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz" S = "${WORKDIR}/${PN}" INHIBIT_PACKAGE_STRIP = "1" diff --git a/recipes/nylon/nylon-statistics.bb b/recipes/nylon/nylon-statistics.bb index ef79bc6..c9b790c 100644 --- a/recipes/nylon/nylon-statistics.bb +++ b/recipes/nylon/nylon-statistics.bb @@ -3,11 +3,12 @@ RDEPENDS = "rrdtool" SECTION = "base" PRIORITY = "optional" LICENSE = "GPLv2" -SRCDATE = "20050909" +#SRCDATE = "20050909" +SRCDATE = "20051022" PV = "1.0.0+cvs${SRCDATE}" PR = "r1" -SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz" S = "${WORKDIR}/${PN}" INHIBIT_PACKAGE_STRIP = "1" diff --git a/recipes/nylon/yamonenv.bb b/recipes/nylon/yamonenv.bb index e963d91..1db737f 100644 --- a/recipes/nylon/yamonenv.bb +++ b/recipes/nylon/yamonenv.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Reads YAMON environment-variables" SECTION = "base" PRIORITY = "optional" LICENSE = "GPL" -SRCDATE = "20050909" +#SRCDATE = "20050909" +SRCDATE = "20051022" PV = "1.0.0+cvs${SRCDATE}" -SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/recipes/openswan/openswan_2.2.0.bb b/recipes/openswan/openswan_2.2.0.bb index b1c5271..bcf5a28 100644 --- a/recipes/openswan/openswan_2.2.0.bb +++ b/recipes/openswan/openswan_2.2.0.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openswan.org" LICENSE = "GPLv2" DEPENDS = "gmp flex-native" RRECOMMENDS = "kernel-module-ipsec" -RDEPENDS_nylon = "perl" +RDEPENDS_append_nylon = "perl" PR = "r5" SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \ diff --git a/recipes/openswan/openswan_2.4.7.bb b/recipes/openswan/openswan_2.4.7.bb index 353e0ea..28e599b 100644 --- a/recipes/openswan/openswan_2.4.7.bb +++ b/recipes/openswan/openswan_2.4.7.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openswan.org" LICENSE = "GPLv2" DEPENDS = "gmp flex-native" RRECOMMENDS = "kernel-module-ipsec" -RDEPENDS_nylon = "perl" +RDEPENDS_append_nylon = "perl" PR = "r0" SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \ diff --git a/recipes/opkg/opkg-native_svn.bb b/recipes/opkg/opkg-native_svn.bb index 82c74e0..37a35a6 100644 --- a/recipes/opkg/opkg-native_svn.bb +++ b/recipes/opkg/opkg-native_svn.bb @@ -1,5 +1,7 @@ require opkg.inc +SRCREV = "HEAD" + DEPENDS = "curl-native" PR = "r3" diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb index a472897..f9804ff 100644 --- a/recipes/opkg/opkg_svn.bb +++ b/recipes/opkg/opkg_svn.bb @@ -1,5 +1,7 @@ require opkg.inc +SRCREV = "HEAD" + PR = "r2" PACKAGES =+ "libopkg-dev libopkg" diff --git a/recipes/pciutils/pciutils_3.1.2.bb b/recipes/pciutils/pciutils_3.1.2.bb index 25782a5..d7458a1 100644 --- a/recipes/pciutils/pciutils_3.1.2.bb +++ b/recipes/pciutils/pciutils_3.1.2.bb @@ -8,6 +8,7 @@ DEPENDS = "zlib" SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ file://pciutils.patch;patch=1 " +SRC_URI_append_nylon = "file://gcc-3-compatibility.patch;patch=1 " PARALLEL_MAKE = "" diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb index e3d7384..57e9e1c 100644 --- a/recipes/perl/perl-native_5.8.8.bb +++ b/recipes/perl/perl-native_5.8.8.bb @@ -85,5 +85,11 @@ do_stage_append() { install $i ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE done } +do_stage_append_nylon() { + # get rid of definitions not supported by the gcc version we use for nylon... + for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_DIR_HOST}/perl/config.sh; do + perl -pi -e 's/-Wdeclaration-after-statement //g' ${i} + done +} PARALLEL_MAKE = "" diff --git a/recipes/rrdtool/rrdtool_1.0.49.bb b/recipes/rrdtool/rrdtool_1.0.49.bb index 11968ea..2e66112 100644 --- a/recipes/rrdtool/rrdtool_1.0.49.bb +++ b/recipes/rrdtool/rrdtool_1.0.49.bb @@ -5,13 +5,17 @@ LICENSE = "GPLv2" DEPENDS = "libpng zlib" DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader" PR = "r2" -SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rdtool-${PV}.tar.gz \ +SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rrdtool-${PV}.tar.gz \ file://perl-make-options.diff;patch=1;pnum=0" inherit autotools EXTRA_OECONF = "--enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''" +do_configure_append_nylon() { + perl -pi -e 's/-Wdeclaration-after-statement //g' ${S}/perl-shared/Makefile +} + do_install_append() { install -d ${D}${docdir}/rrdtool/ mv ${D}/usr/html ${D}${docdir}/rrdtool/