diff options
30 files changed, 392 insertions, 121 deletions
diff --git a/classes/nslu2-image.bbclass b/classes/nslu2-image.bbclass index a06c1d1468..662be2910a 100644 --- a/classes/nslu2-image.bbclass +++ b/classes/nslu2-image.bbclass @@ -3,6 +3,8 @@ nslu2_pack_image () { install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + ${STAGING_LOADER_DIR}/apex-nslu2.bin \ + ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin \ ${DEPLOY_DIR_IMAGE}/slug/ install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS} \ ${DEPLOY_DIR_IMAGE}/slug/vmlinuz @@ -10,14 +12,14 @@ nslu2_pack_image () { ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/ cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -k vmlinuz \ - -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ + slugimage -p -b RedBoot -s SysConf -k vmlinuz -L apex-nslu2.bin \ + -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin - slugimage -F -p -b RedBoot -s SysConf -k vmlinuz \ - -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ + slugimage -F -p -b RedBoot -s SysConf -k vmlinuz -L apex-nslu2-16mb.bin \ + -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin rm -rf ${DEPLOY_DIR_IMAGE}/slug } -EXTRA_IMAGEDEPENDS_nslu2 += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native' +EXTRA_IMAGEDEPENDS_nslu2 += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native apex-nslu2 apex-nslu2-16mb' IMAGE_POSTPROCESS_COMMAND_nslu2 += "nslu2_pack_image; " diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index acfe23d742..b450c07df7 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -145,5 +145,3 @@ IGNORE_STRIP_ERRORS = "" #PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" PREFERRED_VERSION_linux-libc-headers = "2.6.18" - -PREFERRED_VERSION_openssh ?= "4.6p1" diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf index 8deaa092e8..10b4450384 100644 --- a/conf/machine/davinci-dvevm.conf +++ b/conf/machine/davinci-dvevm.conf @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_u-boot = "git" -UBOOT_MACHINE = "davinci_dvevm" +UBOOT_MACHINE = "davinci_dvevm_config" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" diff --git a/packages/apex/apex-nslu2-16mb_1.5.8.bb b/packages/apex/apex-nslu2-16mb_1.5.8.bb new file mode 100644 index 0000000000..e5bf98a6c8 --- /dev/null +++ b/packages/apex/apex-nslu2-16mb_1.5.8.bb @@ -0,0 +1,69 @@ +DESCRIPTION = "APEX Boot Loader" +SECTION = "" +PRIORITY = "optional" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +# PR = "r1" + +# Note that this recipe only works for the NSLU2 at the moment. +# Patches to make it more generic are welcome. + +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://defconfig-16mb" +S = ${WORKDIR}/apex-${PV} + +CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" + +CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 rw" + +CMDLINE_ROOT_nslu2 = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" +CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc" +CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc" + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" + make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed" +} + +# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head +# of the .config file and remove any settings in defconfig then append +# defconfig to .config +do_configure() { + rm -f ${S}/.config + . ${CONFIG_SITE} + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then + sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ + -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ + -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (16MiB Flash)\"/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ + ${WORKDIR}/defconfig-16mb > ${S}/.config + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then + sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \ + -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (16MiB Flash)\"/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ + ${WORKDIR}/defconfig-16mb > ${S}/.config + else + oefatal do_configure cannot determine endianess + fi + oe_runmake oldconfig +} + +DEPENDS += "devio-native" + +do_populate_staging() { + install -d ${STAGING_LOADER_DIR} + . ${CONFIG_SITE} + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then + # FIXME - arch-arm should not be hard-coded + cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then + # FIXME - arch-arm should not be hard-coded + devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin 'xp $,4' + else + oefatal do_populate_staging cannot determine endianess + fi +} diff --git a/packages/apex/apex_1.5.8.bb b/packages/apex/apex-nslu2_1.5.8.bb index ccf08ca9a0..6ed2d20518 100644 --- a/packages/apex/apex_1.5.8.bb +++ b/packages/apex/apex-nslu2_1.5.8.bb @@ -10,6 +10,7 @@ LICENSE = "GPL" SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ file://defconfig" +S = ${WORKDIR}/apex-${PV} CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" @@ -35,14 +36,14 @@ do_configure() { if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ - -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2 (big endian)\"/' \ + -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (8MiB Flash)\"/' \ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ ${WORKDIR}/defconfig > ${S}/.config elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \ - -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2 (little endian)\"/' \ + -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (8MiB Flash)\"/' \ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ ${WORKDIR}/defconfig > ${S}/.config else @@ -58,10 +59,10 @@ do_populate_staging() { . ${CONFIG_SITE} if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then # FIXME - arch-arm should not be hard-coded - cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin + cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2.bin elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then # FIXME - arch-arm should not be hard-coded - devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex.bin 'xp $,4' + devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2.bin 'xp $,4' else oefatal do_populate_staging cannot determine endianess fi diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig index 9bdbef2f6b..3c8522e2e8 100644 --- a/packages/apex/nslu2/defconfig +++ b/packages/apex/nslu2/defconfig @@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y # # General Setup # -CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2 (bigendian)" +CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2/BE (8MiB Flash)" CONFIG_CROSS_COMPILE="" CONFIG_AEABI=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -46,7 +46,6 @@ CONFIG_NOR_BUSWIDTH=16 CONFIG_NOR_BANK0=y CONFIG_NOR_BANK0_START=0x50000000 CONFIG_NOR_BANK0_LENGTH=0x00800000 -CONFIG_ENV_STARTUP="" CONFIG_MACH="ixp42x" CONFIG_MACH_NSLU2=y # CONFIG_MACH_NAS100D is not set @@ -116,7 +115,7 @@ CONFIG_USES_IXP4XX_NPE_ETH=y CONFIG_ENV=y CONFIG_ENV_LINK=y CONFIG_ENV_MUTABLE=y -CONFIG_ENV_REGION="nor:0x7f8000+16k" +CONFIG_ENV_REGION="nor:0x7c000+16k" # CONFIG_ENV_SAVEATONCE is not set CONFIG_ENV_CHECK_LEN=1024 # CONFIG_VARIATIONS is not set diff --git a/packages/apex/nslu2/defconfig-16mb b/packages/apex/nslu2/defconfig-16mb new file mode 100644 index 0000000000..c9688e3d75 --- /dev/null +++ b/packages/apex/nslu2/defconfig-16mb @@ -0,0 +1,156 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: +# Fri Jun 1 17:35:34 2007 +# +CONFIG_ARM=y +CONFIG_CPU_ARMV5=y +CONFIG_CPU_XSCALE=y +# CONFIG_ARCH_LH7952X is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_IXP42X=y +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_MX3 is not set +CONFIG_EXPERIMENTAL=y +# CONFIG_SMALL is not set + +# +# General Setup +# +CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2/BE (16MiB Flash)" +CONFIG_CROSS_COMPILE="" +CONFIG_AEABI=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set +# CONFIG_CC_NO_OPTIMIZATION is not set +CONFIG_STARTUP_UART=y +# CONFIG_DEBUG_LL is not set +CONFIG_SPINNER=y +CONFIG_ATAG=y +CONFIG_MMU=y +# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set +CONFIG_DISABLE_MMU_AT_BOOT=y +# CONFIG_INTERRUPTS is not set +CONFIG_SDRAMBOOT_REPORT=y +CONFIG_STACK_SIZE=0x1000 +CONFIG_STACKLIMIT=y +# CONFIG_BOOTSTRAP_MEMTEST is not set +CONFIG_ATAG_PHYS=0x00000100 +CONFIG_ARCH_NUMBER=597 +CONFIG_APEX_VMA=0x00200000 +CONFIG_KERNEL_LMA=0x00008000 +# CONFIG_USE_RAMDISK is not set +CONFIG_SDRAM_BANK0=y +# CONFIG_SDRAM_BANK1 is not set +CONFIG_NOR_BUSWIDTH=16 +CONFIG_NOR_BANK0=y +CONFIG_NOR_BANK0_START=0x50000000 +CONFIG_NOR_BANK0_LENGTH=0x01000000 +CONFIG_MACH="ixp42x" +CONFIG_MACH_NSLU2=y +# CONFIG_MACH_NAS100D is not set +# CONFIG_MACH_DSMG600 is not set +# CONFIG_MACH_AVILA2347 is not set +# CONFIG_USER_DEFAULTENDIAN is not set +# CONFIG_USER_BIGENDIAN is not set +# CONFIG_USER_LITTLEENDIAN is not set + +# +# Platform Setup +# +CONFIG_SDRAM_BANK_LENGTH=0x02000000 +# CONFIG_DISABLE_SECOND_UART_INIT is not set +CONFIG_ARCH_IXP420=y + +# +# Commands +# +CONFIG_ALLHELP=y +CONFIG_ALPHABETIZE_COMMANDS=y +CONFIG_DEL_IS_BS=y +CONFIG_ANSI_KEYS=y +CONFIG_COMMAND_HISTORY=y +CONFIG_COMMAND_EDITING=y +# CONFIG_TIME_COMMANDS is not set +CONFIG_CMD_ALIAS=y +CONFIG_CMD_CHECKSUM=y +CONFIG_CMD_COPY=y +CONFIG_CMD_COMPARE=y +CONFIG_CMD_DRVINFO=y +CONFIG_CMD_DUMP=y +CONFIG_CMD_ENV=y +CONFIG_CMD_SETENV=y +CONFIG_CMD_ERASE=y +CONFIG_CMD_FILL=y +CONFIG_CMD_GO=y +CONFIG_CMD_INFO=y +# CONFIG_CMD_PAUSE is not set +CONFIG_CMD_WAIT=y +CONFIG_CMD_XRECEIVE=y +CONFIG_CMD_MEMLIMIT=y +CONFIG_CMD_MEMSCAN=y + +# +# Generic Drivers +# +# CONFIG_DRIVER_FAT is not set +# CONFIG_DRIVER_EXT2 is not set +# CONFIG_DRIVER_JFFS2 is not set +CONFIG_DRIVER_FIS=y +CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0xfe0000+4k" +CONFIG_DRIVER_NOR_CFI=y +# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set +# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set +CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y +# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set +# CONFIG_DRIVER_ONENAND is not set +# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set +CONFIG_USES_NOR_CFI=y +CONFIG_USES_PATHNAME_PARSER=y +CONFIG_USES_IXP4XX_NPE_ETH=y + +# +# Environment +# +CONFIG_ENV=y +CONFIG_ENV_LINK=y +CONFIG_ENV_MUTABLE=y +CONFIG_ENV_REGION="nor:0x7c000+16k" +# CONFIG_ENV_SAVEATONCE is not set +CONFIG_ENV_CHECK_LEN=1024 +# CONFIG_VARIATIONS is not set +# CONFIG_NO_BOOTSTRAP is not set +CONFIG_NOR_BOOT=y +# CONFIG_NAND_BOOT is not set +# CONFIG_ONENAND_BOOT is not set +# CONFIG_COMPANION_EVT1_BOOT is not set +# CONFIG_COMPANION_EVT2_BOOT is not set + +# +# Default Startup +# +CONFIG_AUTOBOOT=y +CONFIG_AUTOBOOT_DELAY=10 +CONFIG_ENV_STARTUP_KERNEL_COPY=y +# CONFIG_ENV_REGION_KERNEL_SWAP is not set +# CONFIG_ENV_STARTUP_PREFIX_P is not set + +# +# Regions +# +CONFIG_ENV_REGION_KERNEL="fis://kernel" + +# +# Overrides +# +CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y +CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200" +# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set +CONFIG_USES_NOR_BOOTFLASH=y +CONFIG_RELOCATE_SIMPLE=y +CONFIG_INLINE_PLATFORM_INITIALIZATION=y +CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y +# CONFIG_BIGENDIAN is not set +# CONFIG_LITTLEENDIAN is not set +CONFIG_CLEAR_STACKS=y +CONFIG_ALIASES=y diff --git a/packages/clamav/clamav_0.91.1.bb b/packages/clamav/clamav_0.91.1.bb new file mode 100644 index 0000000000..6b6b16897d --- /dev/null +++ b/packages/clamav/clamav_0.91.1.bb @@ -0,0 +1,5 @@ +DEFAULT_PREFERENCE = "-1" + +require clamav.inc + +PR = "r0" diff --git a/packages/clamsmtp/clamsmtp_1.8.bb b/packages/clamsmtp/clamsmtp_1.8.bb index 38103de033..984d203e36 100644 --- a/packages/clamsmtp/clamsmtp_1.8.bb +++ b/packages/clamsmtp/clamsmtp_1.8.bb @@ -8,7 +8,7 @@ SECTION = "network" LICENSE = "BSD" DEPENDS = "clamav" RDEPENDS_${PN} = "clamav-daemon" -PR = "r1" +PR = "r2" SRC_URI = "http://memberwebs.com/nielsen/software/clamsmtp/clamsmtp-${PV}.tar.gz \ file://update-config.patch;patch=1 \ diff --git a/packages/havp/havp_0.86.bb b/packages/havp/havp_0.86.bb index c5bb0636bb..c1e392e80f 100644 --- a/packages/havp/havp_0.86.bb +++ b/packages/havp/havp_0.86.bb @@ -1,5 +1,5 @@ require havp.inc -PR = "r0" +PR = "r1" SRC_URI_append += " file://reconfigure.patch;patch=1" diff --git a/packages/iana-etc/iana-etc_2.20.bb b/packages/iana-etc/iana-etc_2.20.bb index ccf0b8da8a..6d8c615877 100644 --- a/packages/iana-etc/iana-etc_2.20.bb +++ b/packages/iana-etc/iana-etc_2.20.bb @@ -3,13 +3,16 @@ AUTHOR = "Seth W. Klein" HOMEPAGE = "http://www.sethwklein.net/projects/iana-etc/" SECTION = "base" LICENSE = "OPL" +PR = "r1" SRC_URI = "http://www.sethwklein.net/projects/iana-etc/downloads/${P}.tar.bz2" -do_make(){ - oe_runmake 'STRIP=yes' -} +# Don't install as /etc/protocols and /etc/services since they are installed +# by net-base and are considered config files. Install this side by side so +# end-user can manaulyl copy them and/or take entries from them. See #2505. -do_install(){ - oe_runmake 'DESTDIR=${D}' install +do_install() { + install -d ${D}${sysconfdir} + install -m 644 protocols ${D}${sysconfdir}/protocols.iana + install -m 644 services ${D}${sysconfdir}/services.iana } diff --git a/packages/iproute2/iproute2-2.6.16/iproute2-2.6.15_no_strip.diff b/packages/iproute2/iproute2-2.6.16/iproute2-2.6.15_no_strip.diff deleted file mode 100644 index 496506960e..0000000000 --- a/packages/iproute2/iproute2-2.6.16/iproute2-2.6.15_no_strip.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- ip/Makefile 2006/02/23 21:22:18 1.1 -+++ ip/Makefile 2006/02/23 21:22:27 -@@ -16,7 +16,7 @@ - rtmon: $(RTMONOBJ) $(LIBNETLINK) - - install: all -- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) -+ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) - install -m 0755 $(SCRIPTS) $(DESTDIR)$(SBINDIR) - - clean: ---- tc/Makefile 2006/02/23 21:23:52 1.1 -+++ tc/Makefile 2006/02/23 21:23:57 -@@ -70,9 +70,9 @@ - - install: all - mkdir -p $(DESTDIR)/usr/lib/tc -- install -m 0755 -s tc $(DESTDIR)$(SBINDIR) -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) - for i in $(TCSO); \ -- do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; \ -+ do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \ - done - - clean: diff --git a/packages/iproute2/iproute2-2.6.16/.mtn2git_empty b/packages/iproute2/iproute2-2.6.22/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/iproute2/iproute2-2.6.16/.mtn2git_empty +++ b/packages/iproute2/iproute2-2.6.22/.mtn2git_empty diff --git a/packages/iproute2/iproute2-2.6.22/ip6tunnel.patch b/packages/iproute2/iproute2-2.6.22/ip6tunnel.patch new file mode 100644 index 0000000000..a00a7e79da --- /dev/null +++ b/packages/iproute2/iproute2-2.6.22/ip6tunnel.patch @@ -0,0 +1,12 @@ +This fix is needed when building with uclibc + +--- iproute-2.6.20-070313/ip/ip6tunnel.c 2007/03/17 03:44:27 1.1 ++++ iproute-2.6.20-070313/ip/ip6tunnel.c 2007/03/17 03:43:14 +@@ -33,6 +33,7 @@ + #include <sys/socket.h> + #include <arpa/inet.h> + #include <sys/ioctl.h> ++#include <linux/types.h> + #include <linux/ip.h> + #include <linux/if.h> + #include <linux/if_arp.h> diff --git a/packages/iproute2/iproute2-2.6.16/new-flex-fix.patch b/packages/iproute2/iproute2-2.6.22/new-flex-fix.patch index 2c04087839..af7272163e 100644 --- a/packages/iproute2/iproute2-2.6.16/new-flex-fix.patch +++ b/packages/iproute2/iproute2-2.6.22/new-flex-fix.patch @@ -8,8 +8,8 @@ This fix is as per the one used by opensure: and simple renames str to prevent it conflicting. ---- iproute2-2.6.16-060323/tc/emp_ematch.l 2006/10/30 22:46:29 1.1 -+++ iproute2-2.6.16-060323/tc/emp_ematch.l 2006/10/30 22:47:26 +--- iproute-2.6.20-070313/tc/emp_ematch.l 2007/03/17 02:52:20 1.1 ++++ iproute-2.6.20-070313/tc/emp_ematch.l 2007/03/17 02:54:01 @@ -63,7 +63,7 @@ %} @@ -22,7 +22,7 @@ and simple renames str to prevent it conflicting. @@ -78,17 +78,17 @@ } strbuf_index = 0; - + - BEGIN(str); + BEGIN(STR); } @@ -38,7 +38,7 @@ and simple renames str to prevent it conflicting. -<str>\\[0-7]{1,3} { /* octal escape sequence */ +<STR>\\[0-7]{1,3} { /* octal escape sequence */ int res; - + sscanf(yytext + 1, "%o", &res); @@ -100,12 +100,12 @@ strbuf_append_char((unsigned char) res); @@ -53,7 +53,7 @@ and simple renames str to prevent it conflicting. -<str>\\x[0-9a-fA-F]{1,2} { +<STR>\\x[0-9a-fA-F]{1,2} { int res; - + sscanf(yytext + 2, "%x", &res); @@ -118,16 +118,16 @@ strbuf_append_char((unsigned char) res); diff --git a/packages/iproute2/iproute2-2.6.22/no-strip.patch b/packages/iproute2/iproute2-2.6.22/no-strip.patch new file mode 100644 index 0000000000..6490dadb07 --- /dev/null +++ b/packages/iproute2/iproute2-2.6.22/no-strip.patch @@ -0,0 +1,36 @@ +--- iproute-2.6.20-070313/ip/Makefile 2007/03/17 05:17:30 1.1 ++++ iproute-2.6.20-070313/ip/Makefile 2007/03/17 05:17:37 +@@ -16,7 +16,7 @@ + rtmon: $(RTMONOBJ) $(LIBNETLINK) + + install: all +- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) ++ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) + install -m 0755 $(SCRIPTS) $(DESTDIR)$(SBINDIR) + + clean: +--- iproute-2.6.20-070313/misc/Makefile 2007/03/17 05:18:20 1.1 ++++ iproute-2.6.20-070313/misc/Makefile 2007/03/17 05:18:26 +@@ -27,7 +27,7 @@ + lnstat: $(LNSTATOBJ) + + install: all +- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) ++ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) + ln -sf lnstat $(DESTDIR)$(SBINDIR)/rtstat + ln -sf lnstat $(DESTDIR)$(SBINDIR)/ctstat + +--- iproute-2.6.20-070313/tc/Makefile 2007/03/17 05:17:42 1.1 ++++ iproute-2.6.20-070313/tc/Makefile 2007/03/17 05:17:54 +@@ -70,9 +70,9 @@ + + install: all + mkdir -p $(DESTDIR)/usr/lib/tc +- install -m 0755 -s tc $(DESTDIR)$(SBINDIR) ++ install -m 0755 tc $(DESTDIR)$(SBINDIR) + for i in $(TCSO); \ +- do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; \ ++ do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \ + done + + clean: diff --git a/packages/iproute2/iproute2-2.6.8/iproute2-2.6.8_no_strip.diff b/packages/iproute2/iproute2-2.6.8/iproute2-2.6.8_no_strip.diff deleted file mode 100644 index 0a029a6d51..0000000000 --- a/packages/iproute2/iproute2-2.6.8/iproute2-2.6.8_no_strip.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- ip/Makefile.o 2004-08-05 12:38:25.836331936 +0200 -+++ ip/Makefile 2004-08-05 12:38:42.256835640 +0200 -@@ -22,7 +22,7 @@ - rtmon: $(RTMONOBJ) $(LIBNETLINK) - - install: all -- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) -+ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) - install -m 0755 routel routef $(DESTDIR)$(SBINDIR) - - clean: ---- tc/Makefile.o 2004-08-05 12:37:33.325314824 +0200 -+++ tc/Makefile 2004-08-05 12:38:12.085422392 +0200 -@@ -61,8 +61,8 @@ - - install: all - mkdir -p $(DESTDIR)/usr/lib/tc -- install -m 0755 -s tc $(DESTDIR)$(SBINDIR) -- for i in $(TCSO); do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; done -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) -+ for i in $(TCSO); do install -m 755 $$i $(DESTDIR)/usr/lib/tc; done - - clean: - rm -f $(TCOBJ) $(TCLIB) libtc.a tc diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc index c417280cd6..7162231ec5 100644 --- a/packages/iproute2/iproute2.inc +++ b/packages/iproute2/iproute2.inc @@ -1,16 +1,13 @@ DESCRIPTION = "kernel routing and traffic control utilities" +HOMEPAGE = "http://linux-net.osdl.org/index.php/Iproute2" SECTION = "base" LICENSE = "GPL" DEPENDS = "flex-native bison-native" -# This changed from iproute2 to iproute with version 2.6.20, so set to -# iproute in the recipe for 2.6.20 and newer versions. -DIRNAME ?= "${PN}" - # Set the DATE in the .bb file SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz" -S = "${WORKDIR}/${DIRNAME}-${PV}-${DATE}" +# Set S in the .bb files inherit update-alternatives diff --git a/packages/iproute2/iproute2_2.6.16.bb b/packages/iproute2/iproute2_2.6.16.bb deleted file mode 100644 index 9d261927f6..0000000000 --- a/packages/iproute2/iproute2_2.6.16.bb +++ /dev/null @@ -1,8 +0,0 @@ -PR = "r3" - -SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ - file://new-flex-fix.patch;patch=1" - -require iproute2.inc - -DATE = "060323" diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb index ad62b5344a..ed5f3a11c6 100644 --- a/packages/iproute2/iproute2_2.6.18.bb +++ b/packages/iproute2/iproute2_2.6.18.bb @@ -1,8 +1,10 @@ PR = "r2" +DATE = "061002" + SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ file://new-flex-fix.patch;patch=1" -require iproute2.inc +S = "${WORKDIR}/iproute2-${PV}-${DATE}" -DATE = "061002" +require iproute2.inc diff --git a/packages/iproute2/iproute2_2.6.20.bb b/packages/iproute2/iproute2_2.6.20.bb index 5efdf98f2d..9894bf0567 100644 --- a/packages/iproute2/iproute2_2.6.20.bb +++ b/packages/iproute2/iproute2_2.6.20.bb @@ -1,11 +1,12 @@ PR = "r2" +DATE = "070313" + SRC_URI_append = " file://new-flex-fix.patch;patch=1 \ file://ip6tunnel.patch;patch=1 \ file://man-pages-fix.patch;patch=1 \ file://no-strip.patch;patch=1" -require iproute2.inc +S = "${WORKDIR}/iproute-${PV}-${DATE}" -DIRNAME = "iproute" -DATE = "070313" +require iproute2.inc diff --git a/packages/iproute2/iproute2_2.6.22.bb b/packages/iproute2/iproute2_2.6.22.bb new file mode 100644 index 0000000000..f7347395f6 --- /dev/null +++ b/packages/iproute2/iproute2_2.6.22.bb @@ -0,0 +1,11 @@ +PR = "r1" + +DATE = "070710" + +SRC_URI_append = " file://new-flex-fix.patch;patch=1 \ + file://ip6tunnel.patch;patch=1 \ + file://no-strip.patch;patch=1" + +S = "${WORKDIR}" + +require iproute2.inc diff --git a/packages/iproute2/iproute2_2.6.8.bb b/packages/iproute2/iproute2_2.6.8.bb deleted file mode 100644 index 339471d62d..0000000000 --- a/packages/iproute2/iproute2_2.6.8.bb +++ /dev/null @@ -1,14 +0,0 @@ -SECTION = "base" -DESCRIPTION = "kernel routing and traffic control utilities" -LICENSE = "GPL" - -SRC_URI="http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.8-ss040730.tar.gz \ - file://iproute2-2.6.8_no_strip.diff;patch=1;pnum=0" - -PR="r1" - -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin" - -do_install () { - oe_runmake DESTDIR=${D} install -} diff --git a/packages/iproute2/iproute2-2.6.8/.mtn2git_empty b/packages/net-snmp/net-snmp-5.4.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/iproute2/iproute2-2.6.8/.mtn2git_empty +++ b/packages/net-snmp/net-snmp-5.4.1/.mtn2git_empty diff --git a/packages/net-snmp/net-snmp_5.4.1.bb b/packages/net-snmp/net-snmp_5.4.1.bb new file mode 100644 index 0000000000..0fc36d3ff3 --- /dev/null +++ b/packages/net-snmp/net-snmp_5.4.1.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Various tools relating to the Simple Network Management Protocol" +HOMEPAGE = "http://www.net-snmp.org/" +LICENSE = "BSD" +DEPENDS = "openssl" +RDEPENDS_${PN}-server += "net-snmp-mibs" +RDEPENDS_${PN}-client += "net-snmp-mibs" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ + file://configure-tail.patch;patch=1 \ + file://init \ + file://snmpd.conf \ + file://snmptrapd.conf" + +inherit autotools update-rc.d + +EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults \ + --disable-embedded-perl --with-perl-modules=no" +EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" + +do_configure() { + # Additional flag based on target endiness (see siteinfo.bbclass) + ENDIANESS="${@base_conditional('SITEINFO_ENDIANESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}" + oenote Determined endianess as: $ENDIANESS + libtoolize --force + oe_runconf $ENDIANESS +} +do_install_append() { + install -d ${D}${sysconfdir}/snmp + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd + install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/ + install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/ +} + +PACKAGES = "net-snmp-dbg net-snmp-doc net-snmp-dev net-snmp-libs \ + net-snmp-mibs net-snmp-server net-snmp-client" + +FILES_${PN}-libs = "${libdir}/*" +FILES_${PN}-mibs = "${datadir}/snmp/mibs" +FILES_${PN}-server = "${sbindir}/* ${sysconfdir}" +FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/" +FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" + +CONFFILES_${PN}-server = "${sysconfdir}/snmp/snmpd.conf \ + ${sysconfdir}/snmp/snmptrapd.conf" + +INITSCRIPT_PACKAGES = "${PN}-server" +INITSCRIPT_NAME_${PN}-server = "snmpd" +INITSCRIPT_PARAMS_${PN}-server = "defaults" + +LEAD_SONAME = "libnetsnmp.so" + +PARALLEL_MAKE = "" diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 6775008ea5..f9be31845c 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r20" +PR = "r21" inherit update-rc.d @@ -54,4 +54,6 @@ do_install () { install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces } -CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces" +CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts \ + ${sysconfdir}/network/interfaces ${sysconfdir}/rpc \ + ${sysconfdir}/protocols ${sysconfdir}/services" diff --git a/packages/openssh/openssh_4.6p1.bb b/packages/openssh/openssh_4.6p1.bb index 27bea2ce9a..b38e7ec595 100644 --- a/packages/openssh/openssh_4.6p1.bb +++ b/packages/openssh/openssh_4.6p1.bb @@ -1,5 +1,3 @@ -DEFAULT_PREFERENCE = "-1" - DEPENDS = "zlib openssl" RCONFLICTS_openssh = "dropbear" diff --git a/packages/p3scan/p3scan_2.9.05d.bb b/packages/p3scan/p3scan_2.9.05d.bb index 38739341e6..e419e2e234 100644 --- a/packages/p3scan/p3scan_2.9.05d.bb +++ b/packages/p3scan/p3scan_2.9.05d.bb @@ -6,7 +6,7 @@ SECTION = "network" LICENSE = "GPLv2" DEPENDS = "gmp bzip2 zlib clamav openssl" RDEPENDS_${PN} = "${PN}-templates-en" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/p3scan/p3scan-2.9.05d.tar.gz \ file://libtool-fix.patch;patch=1 \ diff --git a/packages/quagga/quagga_0.99.4.bb b/packages/quagga/quagga_0.99.8.bb index 5231a5da55..6bcc251730 100644 --- a/packages/quagga/quagga_0.99.4.bb +++ b/packages/quagga/quagga_0.99.8.bb @@ -1,3 +1,3 @@ -PR = "r5" +PR = "r0" require quagga.inc diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 28257fab4b..5362a2884f 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -11,18 +11,14 @@ EXTRA_OECONF = "--host=${HOST_SYS} \ --backend=sdl \ --with-sdl-prefix=${STAGING_BINDIR_NATIVE}/.. \ --disable-alsa \ + --prefix=${prefix} \ --with-ogg-prefix=${STAGING_LIBDIR}/.. \ --with-vorbis-prefix=${STAGING_LIBDIR}/.. \ --with-mpeg2-prefix=${STAGING_LIBDIR}/.. \ --with-mad-prefix=${STAGING_LIBDIR}/.. " +EXTRA_OEMAKE = "MANDIR=${mandir}" + do_configure() { ./configure ${EXTRA_OECONF} } - - -do_install() { - install -d ${D}${bindir} - install -m 0755 scummvm ${D}${bindir}/scummvm -} - |