diff options
| -rw-r--r-- | packages/linux/linux-omap2-git/beagleboard/defconfig | 40 | ||||
| -rw-r--r-- | packages/linux/linux-omap2_git.bb | 2 | ||||
| -rw-r--r-- | packages/mysql/files/fix_host_path.patch | 25 | ||||
| -rw-r--r-- | packages/mysql/mysql_4.1.22.bb | 2 |
4 files changed, 50 insertions, 19 deletions
diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 867b5b885c..47c41f1425 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-omap1 -# Wed Sep 3 15:38:48 2008 +# Sat Sep 20 15:44:20 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -615,7 +615,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_MISC_DEVICES=y -# CONFIG_EEPROM_93CX6 is not set +CONFIG_EEPROM_93CX6=m # CONFIG_OMAP_STI is not set # CONFIG_ENCLOSURE_SERVICES is not set CONFIG_HAVE_IDE=y @@ -704,20 +704,36 @@ CONFIG_MII=y CONFIG_WLAN_80211=y CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m -# CONFIG_LIBERTAS_SDIO is not set +CONFIG_LIBERTAS_SDIO=m # CONFIG_LIBERTAS_DEBUG is not set CONFIG_USB_ZD1201=m -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_RTL8187 is not set -# CONFIG_P54_COMMON is not set +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8187=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m # CONFIG_IWLWIFI_LEDS is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y -# CONFIG_B43 is not set +CONFIG_B43=m +CONFIG_B43_LEDS=y +# CONFIG_B43_DEBUG is not set # CONFIG_B43LEGACY is not set -# CONFIG_ZD1211RW is not set -# CONFIG_RT2X00 is not set +# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_LEDS=y +CONFIG_RT2500USB=m +CONFIG_RT2500USB_LEDS=y +CONFIG_RT73USB=m +CONFIG_RT73USB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set # # USB Network Adapters @@ -753,7 +769,7 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOE=m -# CONFIG_PPPOL2TP is not set +CONFIG_PPPOL2TP=m # CONFIG_SLIP is not set CONFIG_SLHC=m # CONFIG_NETCONSOLE is not set @@ -1011,7 +1027,9 @@ CONFIG_OMAP_WATCHDOG=y # Sonics Silicon Backplane # CONFIG_SSB_POSSIBLE=y -# CONFIG_SSB is not set +CONFIG_SSB=m +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set # # Multifunction device drivers diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 5a8aeb16a0..ded3a3bbe8 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -6,7 +6,7 @@ SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848" PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" -PR = "r62" +PR = "r63" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" diff --git a/packages/mysql/files/fix_host_path.patch b/packages/mysql/files/fix_host_path.patch index 4ba1cc0838..4f69cd5198 100644 --- a/packages/mysql/files/fix_host_path.patch +++ b/packages/mysql/files/fix_host_path.patch @@ -13,12 +13,25 @@ # for build ndb docs -@@ -527,7 +527,7 @@ else +@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC") + + # Check if a pid is valid + AC_PATH_PROG(KILL, kill, kill) ++AC_SUBST(KILL,/bin/kill) + AC_MSG_CHECKING("for kill switches") +-if $ac_cv_path_KILL -0 $$ ++if $KILL -0 $$ + then +- CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null" + elif kill -s 0 $$ + then +- CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null" + else AC_MSG_WARN([kill -0 to check for pid seems to fail]) - CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" +- CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" fi --AC_SUBST(CHECK_PID) -+AC_SUBST(CHECK_PID,/bin/kill) + AC_SUBST(CHECK_PID) AC_MSG_RESULT("$CHECK_PID") - - # We need an ANSI C compiler diff --git a/packages/mysql/mysql_4.1.22.bb b/packages/mysql/mysql_4.1.22.bb index c60758b19f..8d7f4057f6 100644 --- a/packages/mysql/mysql_4.1.22.bb +++ b/packages/mysql/mysql_4.1.22.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/" SECTION = "libs" LICENSE = "GPL" DEPENDS = "ncurses" -PR = "r1" +PR = "r2" SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ |