[oe-commits] org.oe.dev merge of '1400bcc94161f278ffef24927913738f7baefb58'
oe commit
openembedded-commits at lists.openembedded.org
Sat Aug 18 12:50:04 UTC 2007
merge of '1400bcc94161f278ffef24927913738f7baefb58'
and 'faf15e6fba7d554cc2bcffcfcc5601be8b383539'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 683035d547a30c5f79f681170ee31566e22d5ed6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=683035d547a30c5f79f681170ee31566e22d5ed6
Files:
1
classes/sanity.bbclass
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/net-snmp/net-snmp_5.4.1.bb
packages/quagga/quagga_0.99.8.bb
classes/nslu2-image.bbclass
conf/distro/include/slugos.inc
conf/machine/davinci-dvevm.conf
packages/apex/nslu2/defconfig
packages/clamsmtp/clamsmtp_1.8.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/netbase/netbase_4.21.bb
packages/openssh/openssh_4.6p1.bb
packages/p3scan/p3scan_2.9.05d.bb
packages/scummvm/scummvm.inc
Diffs:
#
# mt diff -r1400bcc94161f278ffef24927913738f7baefb58 -r683035d547a30c5f79f681170ee31566e22d5ed6
#
#
#
# patch "classes/sanity.bbclass"
# from [994303fc1fb3b4f460621e0ee691d88588acaf70]
# to [808f5e34043a37c456f2b223aace94f414b22349]
#
============================================================
--- classes/sanity.bbclass 994303fc1fb3b4f460621e0ee691d88588acaf70
+++ classes/sanity.bbclass 808f5e34043a37c456f2b223aace94f414b22349
@@ -90,7 +90,7 @@ def check_sanity(e):
if not check_app_exists('${BUILD_PREFIX}g++', e.data):
missing = missing + "C++ Compiler (${BUILD_PREFIX}g++),"
- required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum stty"
+ required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum"
for util in required_utilities.split():
if not check_app_exists( util, e.data ):
@@ -109,11 +109,6 @@ def check_sanity(e):
if not oes_bb_conf:
messages = messages + 'You do not include OpenEmbeddeds version of conf/bitbake.conf\n'
- # Check if the terminal has stty +tostop
- if "tostop" in os.popen("stty").read():
- messages = messages + "You have tostop in your stty terminal setting. This will make BitBake hang when executing. Execute stty -tostop fix this.\n"
-
-
if messages != "":
raise_sanity_error(messages)
#
# mt diff -rfaf15e6fba7d554cc2bcffcfcc5601be8b383539 -r683035d547a30c5f79f681170ee31566e22d5ed6
#
#
#
# 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/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 "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/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/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/scummvm/scummvm.inc"
# from [ce32e4b570cd9283a37a56668c0906cae153a009]
# to [881cbe05da932099a88bebbb6f1576dde96ad1d6]
#
============================================================
--- 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_"
+ %%
+@@ -78,17 +78,17 @@
+ }
+ strbuf_index = 0;
+
+- BEGIN(str);
++ BEGIN(STR);
+ }
+
+-<str>\" {
++<STR>\" {
+ BEGIN(INITIAL);
+ yylval.b = bstr_new(strbuf, strbuf_index);
+ yylval.b->quoted = 1;
+ return ATTRIBUTE;
+ }
+
+-<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);
+ }
+
+-<str>\\[0-9]+ { /* catch wrong octal escape seq. */
++<STR>\\[0-9]+ { /* catch wrong octal escape seq. */
+ fprintf(stderr, "error: invalid octale escape sequence\n");
+ return ERROR;
+ }
+
+-<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);
+ }
+
+-<str>\\n strbuf_append_char('\n');
+-<str>\\r strbuf_append_char('\r');
+-<str>\\t strbuf_append_char('\t');
+-<str>\\v strbuf_append_char('\v');
+-<str>\\b strbuf_append_char('\b');
+-<str>\\f strbuf_append_char('\f');
+-<str>\\a strbuf_append_char('\a');
++<STR>\\n strbuf_append_char('\n');
++<STR>\\r strbuf_append_char('\r');
++<STR>\\t strbuf_append_char('\t');
++<STR>\\v strbuf_append_char('\v');
++<STR>\\b strbuf_append_char('\b');
++<STR>\\f strbuf_append_char('\f');
++<STR>\\a strbuf_append_char('\a');
+
+-<str>\\(.|\n) strbuf_append_char(yytext[1]);
+-<str>[^\\\n\"]+ strbuf_append_charp(yytext);
++<STR>\\(.|\n) strbuf_append_char(yytext[1]);
++<STR>[^\\\n\"]+ strbuf_append_charp(yytext);
+
+ [aA][nN][dD] return AND;
+ [oO][rR] return OR;
============================================================
--- packages/iproute2/iproute2-2.6.22/no-strip.patch 6cd22f05022df1f1c5b46e1959d2daae3e7cfb62
+++ packages/iproute2/iproute2-2.6.22/no-strip.patch 6cd22f05022df1f1c5b46e1959d2daae3e7cfb62
@@ -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:
================================%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list