[oe-commits] org.oe.dev merge of '02c31916f8203f8e8f2ded060c7f3756a95c9841'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sat Aug 18 13:29:45 UTC 2007
merge of '02c31916f8203f8e8f2ded060c7f3756a95c9841'
and '422bef8b6a966bcd08d148e2c1a9a03bf1217087'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7c9631167173e3ba316bc3efd67dece0804859a7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7c9631167173e3ba316bc3efd67dece0804859a7
Files:
1
packages/tasks/task-python-everything.bb
packages/gsm/files/extreplychars.patch
packages/gsm/files/getopt-wait-interpreter-ready.patch
packages/gsm/files/libgsmd-tool-fix.patch
packages/gsm/files/mlbuf-in-gsmd-struct.patch
packages/gsm/files/sms-hacks.patch
packages/gsm/files/tihtc-csq-fix.patch
packages/gsm/files/universal-wcdma.patch
packages/iproute2/iproute2-2.6.16
packages/iproute2/iproute2-2.6.16/iproute2-2.6.15_no_strip.diff
packages/iproute2/iproute2-2.6.16/new-flex-fix.patch
packages/iproute2/iproute2-2.6.8
packages/iproute2/iproute2-2.6.8/iproute2-2.6.8_no_strip.diff
packages/iproute2/iproute2_2.6.16.bb
packages/iproute2/iproute2_2.6.8.bb
packages/quagga/quagga_0.99.4.bb
packages/apex/apex_1.5.8.bb
packages/apex/apex-nslu2_1.5.8.bb
packages/iproute2/iproute2-2.6.22
packages/net-snmp/net-snmp-5.4.1
packages/apex/apex-nslu2-16mb_1.5.8.bb
packages/apex/nslu2/defconfig-16mb
packages/clamav/clamav_0.91.1.bb
packages/iproute2/iproute2-2.6.22/ip6tunnel.patch
packages/iproute2/iproute2-2.6.22/new-flex-fix.patch
packages/iproute2/iproute2-2.6.22/no-strip.patch
packages/iproute2/iproute2_2.6.22.bb
packages/matchbox-keyboard/files/80matchboxkeyboard
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/net-snmp/net-snmp_5.4.1.bb
packages/quagga/quagga_0.99.8.bb
classes/nslu2-image.bbclass
classes/rm_work.bbclass
conf/distro/include/sane-srcdates.inc
conf/distro/include/slugos.inc
conf/machine/davinci-dvevm.conf
packages/apex/nslu2/defconfig
packages/clamsmtp/clamsmtp_1.8.bb
packages/gsm/libgsmd_svn.bb
packages/havp/havp_0.86.bb
packages/iana-etc/iana-etc_2.20.bb
packages/iproute2/iproute2.inc
packages/iproute2/iproute2_2.6.18.bb
packages/iproute2/iproute2_2.6.20.bb
packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch
packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch
packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch
packages/matchbox-keyboard/matchbox-keyboard_svn.bb
packages/netbase/netbase_4.21.bb
packages/openssh/openssh_4.6p1.bb
packages/p3scan/p3scan_2.9.05d.bb
packages/python/python-pygtk-1.2_0.6.12.bb
packages/python/python-pyode_1.0.0.bb
packages/redboot-utils/fis_1.0.bb
packages/scummvm/scummvm.inc
packages/tasks/task-openmoko.bb
packages/uboot/u-boot_1.1.2.bb
packages/uboot/u-boot_1.1.4.bb
packages/uboot/uboot-utils_1.2.0.bb
packages/xorg-util/makedepend-native_1.0.1.bb
packages/xorg-util/makedepend_1.0.1.bb
Diffs:
#
# mt diff -r02c31916f8203f8e8f2ded060c7f3756a95c9841 -r7c9631167173e3ba316bc3efd67dece0804859a7
#
#
#
# patch "packages/tasks/task-python-everything.bb"
# from [3e98f2dd27cca9f4768b4faf85221eb01df5b725]
# to [3da11e0123ff22657bf159c34f7cc113db67db51]
#
============================================================
--- packages/tasks/task-python-everything.bb 3e98f2dd27cca9f4768b4faf85221eb01df5b725
+++ packages/tasks/task-python-everything.bb 3da11e0123ff22657bf159c34f7cc113db67db51
@@ -1,12 +1,10 @@ LICENSE = "MIT"
DESCRIPTION= "Everything Python"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml15"
+PR = "ml17"
RDEPENDS = "\
python-ao \
- python-pybluez \
- python-cairo \
python-cheetah \
python-constraint \
python-crypto \
@@ -40,6 +38,7 @@ RDEPENDS = "\
python-ogg \
python-pexpect \
python-pybluez \
+ python-pycairo \
python-pychecker \
python-pycodes \
python-pyephem \
@@ -54,6 +53,7 @@ RDEPENDS = "\
python-pyiw \
python-pylinda \
python-pylint \
+ python-pyode \
python-pyraf \
python-pyreverse \
python-pyrex \
#
# mt diff -r422bef8b6a966bcd08d148e2c1a9a03bf1217087 -r7c9631167173e3ba316bc3efd67dece0804859a7
#
#
#
# delete "packages/gsm/files/extreplychars.patch"
#
# delete "packages/gsm/files/getopt-wait-interpreter-ready.patch"
#
# delete "packages/gsm/files/libgsmd-tool-fix.patch"
#
# delete "packages/gsm/files/mlbuf-in-gsmd-struct.patch"
#
# delete "packages/gsm/files/sms-hacks.patch"
#
# delete "packages/gsm/files/tihtc-csq-fix.patch"
#
# delete "packages/gsm/files/universal-wcdma.patch"
#
# delete "packages/iproute2/iproute2-2.6.16"
#
# delete "packages/iproute2/iproute2-2.6.16/iproute2-2.6.15_no_strip.diff"
#
# delete "packages/iproute2/iproute2-2.6.16/new-flex-fix.patch"
#
# delete "packages/iproute2/iproute2-2.6.8"
#
# delete "packages/iproute2/iproute2-2.6.8/iproute2-2.6.8_no_strip.diff"
#
# delete "packages/iproute2/iproute2_2.6.16.bb"
#
# delete "packages/iproute2/iproute2_2.6.8.bb"
#
# delete "packages/quagga/quagga_0.99.4.bb"
#
# rename "packages/apex/apex_1.5.8.bb"
# to "packages/apex/apex-nslu2_1.5.8.bb"
#
# add_dir "packages/iproute2/iproute2-2.6.22"
#
# add_dir "packages/net-snmp/net-snmp-5.4.1"
#
# add_file "packages/apex/apex-nslu2-16mb_1.5.8.bb"
# content [14115392139c7f57ea82db2f816b5069fffa2238]
#
# add_file "packages/apex/nslu2/defconfig-16mb"
# content [30b461aef003e2129495c0913af356afcb300e6b]
#
# add_file "packages/clamav/clamav_0.91.1.bb"
# content [7c3791a3534fbc04fac0dbd2e2bee620df48358f]
#
# add_file "packages/iproute2/iproute2-2.6.22/ip6tunnel.patch"
# content [07df2f1c38e472ddcb5f690d6bbb3988f50e884d]
#
# add_file "packages/iproute2/iproute2-2.6.22/new-flex-fix.patch"
# content [2852a92603642d0a86db0071a69c7d7d718df9d0]
#
# add_file "packages/iproute2/iproute2-2.6.22/no-strip.patch"
# content [6cd22f05022df1f1c5b46e1959d2daae3e7cfb62]
#
# add_file "packages/iproute2/iproute2_2.6.22.bb"
# content [28d1664648a88b8b5aa700e83e34d2c45254a163]
#
# add_file "packages/matchbox-keyboard/files/80matchboxkeyboard"
# content [3e115dbddc0ccb069ea314f252937bcc7fd3b3f7]
#
# add_file "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
# content [36d86adb332789d1285b9bbce6d99ba323d635ca]
#
# add_file "packages/net-snmp/net-snmp_5.4.1.bb"
# content [ff7414ae272b8ed952c42949e3929a976ddff839]
#
# add_file "packages/quagga/quagga_0.99.8.bb"
# content [eec4379d7d239e3a33b5ffdfc910d255dadf8e91]
#
# patch "classes/nslu2-image.bbclass"
# from [80f02607f4bbcce93591afb8c7424a2ce9717511]
# to [71b86c06661e4410945f4c6b9f042c09710e689b]
#
# patch "classes/rm_work.bbclass"
# from [ac5939a096d5914a050f77e376a6cf68c3e775a5]
# to [3c8ff49c617d0924fef4b991d29f8b91ab35b298]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [f9d3413e6e73e9275c56f01b9a03de1a022208e0]
# to [8474adf8121756bae4ae80bf72d1c091265f8ae3]
#
# patch "conf/distro/include/slugos.inc"
# from [8815c04029a7743b2e7c97af8068899853cd3143]
# to [1ed5c83dbbd6bec20b79c26848084996f55b58d2]
#
# patch "conf/machine/davinci-dvevm.conf"
# from [e9f21b6a37024cda89bab889af2959652df27a9e]
# to [ad3f1d36c3ae769c5772533d8f1a3c8a48db13e4]
#
# patch "packages/apex/apex-nslu2_1.5.8.bb"
# from [2d94006081eec2999fbdcabc50ff913a57914a72]
# to [a955d4e6ecf87a690890636436fb86c26ee760ec]
#
# patch "packages/apex/nslu2/defconfig"
# from [d1192d9c161dcf4c55f95b991c7175fbd1b1faa3]
# to [d8fab038940bde31b753345df98a6eff78511a07]
#
# patch "packages/clamsmtp/clamsmtp_1.8.bb"
# from [42f32e0aadc99b67383ae08e64c6e0f10d01fc20]
# to [04779b98e5b7d98deae388246ed78966062c2a04]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [93be8aaf85e129126e05afcdbd9748e3387c3d47]
# to [8f6e0a51dc6a9690a8c44a5d73a3289745b547cf]
#
# patch "packages/havp/havp_0.86.bb"
# from [905e48c82366ed6ea1ebfa7d823f681af1bfe796]
# to [2b23274d5d114b2808ea2e7aa80d8bf51a223def]
#
# patch "packages/iana-etc/iana-etc_2.20.bb"
# from [1ac37d6f2237b8b3d2698cb9043b507d850169dc]
# to [ca8b60d989df53dad89e2c0b6a36c10d19c1cfab]
#
# patch "packages/iproute2/iproute2.inc"
# from [8ced56f6a6b7b1b35bc1eac1f631ae11a91617e0]
# to [fd345dd57f1584cddb0bf37fb78ebdc3cc7f79c5]
#
# patch "packages/iproute2/iproute2_2.6.18.bb"
# from [ed105c98db7cbc002aa5185aac193dd86b7f6b89]
# to [de61bbd99de524961f5a3d17baf23027a0e96e1a]
#
# patch "packages/iproute2/iproute2_2.6.20.bb"
# from [1645f0e483e54de590c831fb8a46a0c999c4b0c9]
# to [77cb5ddd5dc68c4440577a201f110c7c589eeac1]
#
# patch "packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch"
# from [d37f4c2f59e428172f8a70481172f2c8813790b4]
# to [abb667bd8d124acc351a36f00c0d452e094e105d]
#
# patch "packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch"
# from [f1007f312f166afc1af40a84f7d2cee5f1e5e9d2]
# to [9f4820b13f07c71e14826caa39826628e064679c]
#
# patch "packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch"
# from [caf942b51b36963448104e736cae985e67435a8c]
# to [edcdbeb783f5016e7bde8344932aaa73ac22e0b9]
#
# patch "packages/matchbox-keyboard/matchbox-keyboard_svn.bb"
# from [a7289c30f50e306ac225353bc9414e7222dc8286]
# to [b7920815c69b3386351e67b86430525753ce2873]
#
# patch "packages/netbase/netbase_4.21.bb"
# from [23eca4d14ac0f328bd75fa024d96b2514d2ff9a6]
# to [3fec27517cd3465754989f44477022d59bf7749a]
#
# patch "packages/openssh/openssh_4.6p1.bb"
# from [af980ce34132a255f09adfcc9c6dca24ba3fa96a]
# to [b6dd08fb7fd9e64409034815aef2658608f0968f]
#
# patch "packages/p3scan/p3scan_2.9.05d.bb"
# from [d16800fce7f242b13af682bd3f5659d757ceb2a8]
# to [9368c7b776b2c76b34ee17ddc5cf39cdcd4f8bcf]
#
# patch "packages/python/python-pygtk-1.2_0.6.12.bb"
# from [9cd20b4fbedfd7c2d2350dfdd078cb7dc6c7afbc]
# to [2abab9054c28a7d28d3c736bf7a117d55a4a9d3d]
#
# patch "packages/python/python-pyode_1.0.0.bb"
# from [0d64dcaf1c9f664946bb9464b0d3bfbd85845b94]
# to [3155048f4bd919058e947897229b986de8dc0f32]
#
# patch "packages/redboot-utils/fis_1.0.bb"
# from [a66b4741b57f521582e2e3edd47cc42cebe7097d]
# to [423fde1a30e871e390b48542349b88efb3a07ac9]
#
# patch "packages/scummvm/scummvm.inc"
# from [ce32e4b570cd9283a37a56668c0906cae153a009]
# to [881cbe05da932099a88bebbb6f1576dde96ad1d6]
#
# patch "packages/tasks/task-openmoko.bb"
# from [0362fd55ab796b7fe95c9d3f9af42dc9d2eb3839]
# to [8b037b50419fa01babd6a99e14c281d0c0b641bd]
#
# patch "packages/uboot/u-boot_1.1.2.bb"
# from [16bfcf693d217b7d96a053df2b2eb514bbadc898]
# to [92cf95f3cb2183350d8652417e5b8c2a831c602c]
#
# patch "packages/uboot/u-boot_1.1.4.bb"
# from [3abf6a09c1cf0e95c0a731971469e8adcae0e02f]
# to [d038552bd2f9296f6e46ab33c2c4ebb364477fec]
#
# patch "packages/uboot/uboot-utils_1.2.0.bb"
# from [b72d6934fb848bef58cebbfbbc5593cefebcfca5]
# to [f7517fc7aea30f86896606bcfc953b6fe63234e0]
#
# patch "packages/xorg-util/makedepend-native_1.0.1.bb"
# from [2fa373a4635f8f5e54384a66aacd2efbfe8a2fe7]
# to [43d5452f9fc931479b465cbc961c32c71bed94d5]
#
# patch "packages/xorg-util/makedepend_1.0.1.bb"
# from [06790d0adb7f2e5412286abfeb7413e26d11acdc]
# to [46d1427414623a18096276050e119095dac43e3d]
#
============================================================
--- packages/apex/apex-nslu2-16mb_1.5.8.bb 14115392139c7f57ea82db2f816b5069fffa2238
+++ packages/apex/apex-nslu2-16mb_1.5.8.bb 14115392139c7f57ea82db2f816b5069fffa2238
@@ -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
+}
============================================================
--- packages/apex/nslu2/defconfig-16mb 30b461aef003e2129495c0913af356afcb300e6b
+++ packages/apex/nslu2/defconfig-16mb 30b461aef003e2129495c0913af356afcb300e6b
@@ -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
============================================================
--- packages/clamav/clamav_0.91.1.bb 7c3791a3534fbc04fac0dbd2e2bee620df48358f
+++ packages/clamav/clamav_0.91.1.bb 7c3791a3534fbc04fac0dbd2e2bee620df48358f
@@ -0,0 +1,5 @@
+DEFAULT_PREFERENCE = "-1"
+
+require clamav.inc
+
+PR = "r0"
============================================================
--- packages/iproute2/iproute2-2.6.22/ip6tunnel.patch 07df2f1c38e472ddcb5f690d6bbb3988f50e884d
+++ packages/iproute2/iproute2-2.6.22/ip6tunnel.patch 07df2f1c38e472ddcb5f690d6bbb3988f50e884d
@@ -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>
============================================================
--- packages/iproute2/iproute2-2.6.22/new-flex-fix.patch 2852a92603642d0a86db0071a69c7d7d718df9d0
+++ packages/iproute2/iproute2-2.6.22/new-flex-fix.patch 2852a92603642d0a86db0071a69c7d7d718df9d0
@@ -0,0 +1,83 @@
+The tc command was failing to build due to flex errors. These errors are
+caused by an incompatible change to flex in recent versions, including the
+version shipped with OE.
+
+This fix is as per the one used by opensure:
+
+ http://lists.opensuse.org/opensuse-commit/2006-04/msg00090.html
+
+and simple renames str to prevent it conflicting.
+
+--- 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 @@
+
+ %}
+
+-%x str
++%x STR
+
+ %option 8bit stack warn noyywrap prefix="ematch_"%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list