[oe-commits] org.oe.dev merge of '42c7569b1dc10cfed4aef02b04809e2247f3f535'

[oe commit]

merge of '42c7569b1dc10cfed4aef02b04809e2247f3f535'
     and 'e0ffb9b29f40ba86057125fc2c1f717ffd362976'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 15bd9ab3bb169e676b199f732c73e4daa38511ce
ViewMTN: http://monotone.openembedded.org/revision.psp?id=15bd9ab3bb169e676b199f732c73e4daa38511ce
Files:
1
conf/machine/include/tune-pentium.conf
conf/machine/include/tune-pentium.inc
conf/machine/include/tune-pentiumpro.conf
conf/machine/include/tune-pentiumpro.inc
conf/machine/i586-generic.conf
conf/machine/i686-generic.conf
site/ix86-common
conf/distro/include/sane-srcrevs.inc
conf/distro/angstrom-2008.1.conf
Diffs:

#
# mt diff -r42c7569b1dc10cfed4aef02b04809e2247f3f535 -r15bd9ab3bb169e676b199f732c73e4daa38511ce
#
# 
# 
# rename "conf/machine/include/tune-pentium.conf"
#     to "conf/machine/include/tune-pentium.inc"
# 
# rename "conf/machine/include/tune-pentiumpro.conf"
#     to "conf/machine/include/tune-pentiumpro.inc"
# 
# patch "conf/machine/i586-generic.conf"
#  from [7f2abcd86ad5dde6d2411133e92d2c7e426af0ab]
#    to [006a74a863afd1f923bb67cedef39bf4391cffd0]
# 
# patch "conf/machine/i686-generic.conf"
#  from [147c4ce5a52c09889cbd316c311ec4030e0797ef]
#    to [ee687be060f3975c6581a344e0fcff555311c4c0]
# 
# patch "site/ix86-common"
#  from [d8fa481822d52ac3e2192ceabc012ca07c564206]
#    to [816379b5c0b279c98a6108161517dcc6d67a9eb0]
# 
============================================================
--- conf/machine/i586-generic.conf	7f2abcd86ad5dde6d2411133e92d2c7e426af0ab
+++ conf/machine/i586-generic.conf	006a74a863afd1f923bb67cedef39bf4391cffd0
@@ -25,5 +25,5 @@ MACHINE_TASK_PROVIDER = "task-base"
 
 
 #tune for pentium cpu
-require conf/machine/include/tune-pentium.conf
+require conf/machine/include/tune-pentium.inc
 
============================================================
--- conf/machine/i686-generic.conf	147c4ce5a52c09889cbd316c311ec4030e0797ef
+++ conf/machine/i686-generic.conf	ee687be060f3975c6581a344e0fcff555311c4c0
@@ -23,5 +23,5 @@ MACHINE_TASK_PROVIDER = "task-base"
 MACHINE_TASK_PROVIDER = "task-base"
 
 #tune for pentium pro cpu
-require conf/machine/include/tune-pentiumpro.conf
+require conf/machine/include/tune-pentiumpro.inc
 
============================================================
--- site/ix86-common	d8fa481822d52ac3e2192ceabc012ca07c564206
+++ site/ix86-common	816379b5c0b279c98a6108161517dcc6d67a9eb0
@@ -166,6 +166,9 @@ ac_libnet_have_packet_socket=${ac_libnet
 ac_cv_lbl_unaligned_fail=${ac_cv_lbl_unaligned_fail=no}
 ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 
+# libpcap
+ac_cv_linux_vers=${ac_cv_linux_vers=2}
+
 # libxfce4util
 with_broken_putenv=${with_broken_putenv=no}
 


#
# mt diff -re0ffb9b29f40ba86057125fc2c1f717ffd362976 -r15bd9ab3bb169e676b199f732c73e4daa38511ce
#
# 
# 
# add_file "conf/distro/include/sane-srcrevs.inc"
#  content [a91d71aa246c9939199aabe9bafe087f0b860a4d]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [8a3187bfeabfc7d9f5c299a7ba5cd346e3aba275]
#    to [07f73119ae13cbfa759edeaf36c895f08edaf726]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	a91d71aa246c9939199aabe9bafe087f0b860a4d
+++ conf/distro/include/sane-srcrevs.inc	a91d71aa246c9939199aabe9bafe087f0b860a4d
@@ -0,0 +1,74 @@
+#Ggenerated with 
+# bitbake -s | grep svnr  | awk '{print "SRCREV_pn-" $1 "=" $2}' | \
+# sed -e s:\+:\=:g -e s:svnr::g| awk -F "=" '{print $1 "=\"" $3}' | \
+# awk -F "-r" '{print $1"\""}'
+
+# This will miss recipes that have skippackage set (e.g. uclibc)
+
+SRCREV_pn-dfu-util="2866"
+SRCREV_pn-dfu-util-native="2866"
+SRCREV_pn-eglibc="3376"
+SRCREV_pn-eglibc-initial="3376"
+SRCREV_pn-eglibc-intermediate="3376"
+SRCREV_pn-elf2flt="1786"
+SRCREV_pn-gnuradio="6316"
+SRCREV_pn-hildon-1="13599"
+SRCREV_pn-libgsmd="2806"
+SRCREV_pn-libmokogsmd2="2780"
+SRCREV_pn-libmokojournal2="2780"
+SRCREV_pn-libmokopanelui2="2892"
+SRCREV_pn-libmokoui2="2868"
+SRCREV_pn-libowl="277"
+SRCREV_pn-libxosd="627"
+SRCREV_pn-llvm-gcc4="41698"
+SRCREV_pn-llvm-gcc4-cross="41698"
+SRCREV_pn-matchbox-desktop-2="1649"
+SRCREV_pn-matchbox-keyboard="1583"
+SRCREV_pn-matchbox-panel-2="1626"
+SRCREV_pn-neod="2901"
+SRCREV_pn-openmoko-appmanager="1851"
+SRCREV_pn-openmoko-calculator="2404"
+SRCREV_pn-openmoko-calculator2="2789"
+SRCREV_pn-openmoko-common="397"
+SRCREV_pn-openmoko-common2="2679"
+SRCREV_pn-openmoko-contacts="2298"
+SRCREV_pn-openmoko-contacts2="335"
+SRCREV_pn-openmoko-dates="467"
+SRCREV_pn-openmoko-dialer="2811"
+SRCREV_pn-openmoko-dialer2="2869"
+SRCREV_pn-openmoko-feedreader2="2905"
+SRCREV_pn-openmoko-finger-demo="1671"
+SRCREV_pn-openmoko-firststart2="2873"
+SRCREV_pn-openmoko-footer="2354"
+SRCREV_pn-openmoko-icon-theme-standard="2232"
+SRCREV_pn-openmoko-icon-theme-standard2="2840"
+SRCREV_pn-openmoko-keyboard="1631"
+SRCREV_pn-openmoko-libs="2367"
+SRCREV_pn-openmoko-mediaplayer2="2883"
+SRCREV_pn-openmoko-messages="2276"
+SRCREV_pn-openmoko-panel-battery="2897"
+SRCREV_pn-openmoko-panel-bt="2896"
+SRCREV_pn-openmoko-panel-clock="2567"
+SRCREV_pn-openmoko-panel-demo="1622"
+SRCREV_pn-openmoko-panel-demo-simple="1328"
+SRCREV_pn-openmoko-panel-gps="2900"
+SRCREV_pn-openmoko-panel-gsm="2894"
+SRCREV_pn-openmoko-panel-mainmenu="2567"
+SRCREV_pn-openmoko-panel-usb="2893"
+SRCREV_pn-openmoko-session="152"
+SRCREV_pn-openmoko-simplemediaplayer="1688"
+SRCREV_pn-openmoko-sound-theme-standard="2827"
+SRCREV_pn-openmoko-stylus-demo="2324"
+SRCREV_pn-openmoko-stylus-demo-simple="1818"
+SRCREV_pn-openmoko-taskmanager="1663"
+SRCREV_pn-openmoko-tasks="320"
+SRCREV_pn-openmoko-tasks2="320"
+SRCREV_pn-openmoko-theme-standard="2370"
+SRCREV_pn-openmoko-theme-standard-qvga="2370"
+SRCREV_pn-openmoko-today="2556"
+SRCREV_pn-openmoko-today2="2919"
+SRCREV_pn-openmoko-today2-folders="2680"
+SRCREV_pn-opentapi="2012"
+SRCREV_pn-sphyrna="43"
+SRCREV_pn-webkit-gtk="webcore"
+SRCREV_pn-xoo="1623"
============================================================
--- conf/distro/angstrom-2008.1.conf	8a3187bfeabfc7d9f5c299a7ba5cd346e3aba275
+++ conf/distro/angstrom-2008.1.conf	07f73119ae13cbfa759edeaf36c895f08edaf726
@@ -21,10 +21,6 @@ PREFERRED_VERSION_gcc-cross         = "4
 PREFERRED_VERSION_gcc               = "4.2.1"
 PREFERRED_VERSION_gcc-cross         = "4.2.1"
 
-PREFERRED_VERSION_binutils          = "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross    = "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12"
-
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers = "2.6.22"