diff options
-rw-r--r-- | conf/machine/include/gumstix.inc | 7 | ||||
-rw-r--r-- | conf/machine/include/palm.conf | 2 | ||||
-rw-r--r-- | conf/machine/palmtx.conf | 13 | ||||
-rw-r--r-- | packages/fuse/fuse_2.5.3.bb | 17 | ||||
-rw-r--r-- | packages/fuse/fuse_2.6.0.bb | 17 | ||||
-rw-r--r-- | packages/fuse/sshfs-fuse_1.3.bb | 13 | ||||
-rw-r--r-- | packages/fuse/sshfs-fuse_1.8.bb (renamed from packages/fuse/sshfs-fuse_1.7.bb) | 4 | ||||
-rw-r--r-- | packages/libsdl/libsdl-ttf-native_2.0.3.bb | 2 | ||||
-rw-r--r-- | packages/linux/linux-hackndev-2.6/palmtx/defconfig | 142 | ||||
-rw-r--r-- | packages/linux/linux-hackndev-2.6_svn.bb | 2 | ||||
-rw-r--r-- | packages/linux/linux-handhelds-2.6/h2200/defconfig | 4 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-dialer2_svn.bb | 4 | ||||
-rw-r--r-- | packages/openocd/openocd_svn.bb | 2 | ||||
-rw-r--r-- | packages/tasks/task-sdl.bb | 59 |
14 files changed, 196 insertions, 92 deletions
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc index c271940f63..67fefd3835 100644 --- a/conf/machine/include/gumstix.inc +++ b/conf/machine/include/gumstix.inc @@ -20,12 +20,15 @@ MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-unix \ +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \ kernel-module-rtc-core \ kernel-module-rtc-dev \ kernel-module-rtc-proc \ kernel-module-rtc-sa1100 \ - kernel-module-rtc-sysfs" + kernel-module-rtc-sysfs \ + kernel-module-smc91x \ + kernel-module-gumstix-smc91x \ + " # used by sysvinit_2 diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf index 821ebc4c03..5371016ea9 100644 --- a/conf/machine/include/palm.conf +++ b/conf/machine/include/palm.conf @@ -57,7 +57,7 @@ module_autoload_snd-timer = "snd-timer" module_autoload_soundcore = "soundcore" module_autoload_wm97xx-ts = "wm97xx-ts" module_autoload_pxa27x-keyboard = "pxa27x-keyboard" -module_autoload_palmtx-battery = "palmtx-battery" +module_autoload_palmtx_battery = "palmtx_battery" module_autoload_palmz72_battery = "palmz72_battery" module_autoload_i2c-dev = "i2c-dev" module_autoload_i2c-pxa = "i2c-pxa" diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf index 9f1f079cdc..e0db5f246b 100644 --- a/conf/machine/palmtx.conf +++ b/conf/machine/palmtx.conf @@ -15,4 +15,15 @@ SERIAL_CONSOLE = "115200 ttyS0" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ kernel-module-wm97xx-ts \ - kernel-module-palmtx-battery" + kernel-module-palmtx-battery \ + kernel-module-palmtx-border \ + kernel-module-bcm2035-uart \ + kernel-module-palmtx-pcmcia \ + kernel-module-pcmcia-core \ + kernel-module-pda-power \ + kernel-module-pxa2xx-core \ + kernel-module-snd-pxa2xx-ac97 \ + kernel-module-snd-pxa2xx-pcm" + + +module_autoload_g_ether = "g_ether" diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb deleted file mode 100644 index b3f45381a0..0000000000 --- a/packages/fuse/fuse_2.5.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -require fuse.inc - -PR = "r2" - -#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils -PACKAGES += "fuse-utils" -FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dev += "${libdir}/*.la" -FILES_fuse-utils = "${bindir} ${base_sbindir}" -DEBIAN_NOAUTONAME_fuse-utils = "1" -EXTRA_OECONF = " --disable-kernel-module" - -fakeroot do_stage() { - autotools_stage_all -} - - diff --git a/packages/fuse/fuse_2.6.0.bb b/packages/fuse/fuse_2.6.0.bb deleted file mode 100644 index 7eff4dce46..0000000000 --- a/packages/fuse/fuse_2.6.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -require fuse.inc - -SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1" - -EXTRA_OECONF = " --disable-kernel-module" - -#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils -PACKAGES =+ "lib${PN} libulockmgr" -FILES_${PN}-dev += "${libdir}/*.la" -FILES_lib${PN} = "${libdir}/libfuse*.so.*" -FILES_libulockmgr = "${libdir}/libulockmgr.so.*" - -fakeroot do_stage() { - autotools_stage_all -} - - diff --git a/packages/fuse/sshfs-fuse_1.3.bb b/packages/fuse/sshfs-fuse_1.3.bb deleted file mode 100644 index adb0b3586f..0000000000 --- a/packages/fuse/sshfs-fuse_1.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html" -DESCRIPTION = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE." - -LICENSE_${PN} = "LGPL" - -DEPENDS = "fakeroot-native fuse" -RRECOMMENDS_${PN} = "fuse-module" - -SRC_URI="${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" - -inherit autotools pkgconfig - - diff --git a/packages/fuse/sshfs-fuse_1.7.bb b/packages/fuse/sshfs-fuse_1.8.bb index 1f40ac8c8c..0ca2e132bc 100644 --- a/packages/fuse/sshfs-fuse_1.7.bb +++ b/packages/fuse/sshfs-fuse_1.8.bb @@ -5,11 +5,9 @@ SECTION = "console/network" PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "glib-2.0 fuse" - -PR = "r1" +PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" - S = "${WORKDIR}/${P}" inherit autotools diff --git a/packages/libsdl/libsdl-ttf-native_2.0.3.bb b/packages/libsdl/libsdl-ttf-native_2.0.3.bb index 9786c352b2..0c37f4c5a1 100644 --- a/packages/libsdl/libsdl-ttf-native_2.0.3.bb +++ b/packages/libsdl/libsdl-ttf-native_2.0.3.bb @@ -6,5 +6,5 @@ FILESPATH = "${FILE_DIRNAME}/libsdl-ttf-${PV}:${FILE_DIRNAME}/libsdl-ttf:${FILE_ EXTRA_OECONF = "--disable-sdltest --with-sdl-prefix=${STAGING_LIBDIR}/.." -export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config-native" +export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config" diff --git a/packages/linux/linux-hackndev-2.6/palmtx/defconfig b/packages/linux/linux-hackndev-2.6/palmtx/defconfig index 432e70379f..3d61c6d28d 100644 --- a/packages/linux/linux-hackndev-2.6/palmtx/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmtx/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hnd3 -# Wed Aug 8 12:55:12 2007 +# Mon Aug 27 18:29:55 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -165,30 +165,31 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_MAGICIAN is not set # CONFIG_MACH_HTCAPACHE is not set # CONFIG_MACH_BLUEANGEL is not set -# CONFIG_MACH_HTCBEETLES is not set -# CONFIG_MACH_HW6900 is not set +# CONFIG_HTC_HW6X00 is not set # CONFIG_MACH_HTCATHENA is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X50 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set -# CONFIG_MACH_XSCALE_PALMLD is not set -# CONFIG_MACH_XSCALE_PALMTREO650 is not set -# CONFIG_MACH_XSCALE_TREO680 is not set -# CONFIG_MACH_T700WX is not set # CONFIG_MACH_TUNGE2 is not set +# CONFIG_MACH_OMAP_PALMTC is not set # CONFIG_MACH_T3XSCALE is not set # CONFIG_MACH_XSCALE_PALMTT5 is not set CONFIG_MACH_XSCALE_PALMTX=y # CONFIG_PALMTX_DEBUG is not set CONFIG_PALMTX_BATTERY=m CONFIG_PALMTX_PM=y -# CONFIG_MACH_PALMZ72 is not set -# CONFIG_MACH_OMAP_PALMTC is not set +CONFIG_PALMTX_PCMCIA=m +CONFIG_PALMTX_BORDER=m +# CONFIG_MACH_XSCALE_PALMLD is not set # CONFIG_MACH_ZIRE31 is not set CONFIG_GPIOED=m CONFIG_GPIOEDNG=m +# CONFIG_MACH_PALMZ72 is not set +# CONFIG_MACH_XSCALE_PALMTREO650 is not set +# CONFIG_MACH_XSCALE_TREO680 is not set +# CONFIG_MACH_T700WX is not set # CONFIG_MACH_GHI270HG is not set # CONFIG_MACH_GHI270 is not set # CONFIG_MACH_LOOXC550 is not set @@ -230,7 +231,16 @@ CONFIG_XSCALE_PMU=y # # PCCARD (PCMCIA/CardBus) support # -# CONFIG_PCCARD is not set +CONFIG_PCCARD=m +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_PCMCIA_PXA2XX=m # # Kernel Features @@ -422,16 +432,26 @@ CONFIG_IRCOMM=m # CONFIG_PXA_FICP=y CONFIG_BT=m -# CONFIG_BT_L2CAP is not set -# CONFIG_BT_SCO is not set +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m # # Bluetooth device drivers # CONFIG_BT_HCIUART=m -# CONFIG_BT_HCIUART_H4 is not set -# CONFIG_BT_HCIUART_BCSP is not set -# CONFIG_BT_BCM2035UART is not set +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIDTL1 is not set +# CONFIG_BT_HCIBT3C is not set +CONFIG_BT_BCM2035UART=m +# CONFIG_BT_HCIBLUECARD is not set +# CONFIG_BT_HCIBTUART is not set # CONFIG_BT_HCIVHCI is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set @@ -448,9 +468,9 @@ CONFIG_WIRELESS_EXT=y # # Generic Driver Options # -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set +# CONFIG_STANDALONE is not set +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FW_LOADER=m # CONFIG_SYS_HYPERVISOR is not set # @@ -563,6 +583,11 @@ CONFIG_MII=y # CONFIG_NET_RADIO is not set # +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# # Wan interfaces # # CONFIG_WAN is not set @@ -674,7 +699,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_RS232_SERIAL is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_LEGACY_PTY_COUNT=16 # # IPMI @@ -690,6 +715,13 @@ CONFIG_HW_RANDOM=m # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_TIHTC is not set + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set # CONFIG_RAW_DRIVER is not set # @@ -700,7 +732,46 @@ CONFIG_HW_RANDOM=m # # I2C support # -# CONFIG_I2C is not set +CONFIG_I2C=m +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set +# CONFIG_I2C_ALGOPXA is not set + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_I2C_ADCM2650 is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCA9535 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_OV9640 is not set +# CONFIG_I2C_OV96XX is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set # # SPI support @@ -816,6 +887,9 @@ CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_ADV_DEBUG=y CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set # CONFIG_PXACI is not set # @@ -834,7 +908,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CORGI=y -# CONFIG_BACKLIGHT_PXAPWM is not set CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set @@ -922,6 +995,13 @@ CONFIG_SND_AC97_CODEC=y # CONFIG_SND_PXA2xx_I2SOUND is not set CONFIG_SND_PXA2XX_PCM=y CONFIG_SND_PXA2XX_AC97=y +# CONFIG_SND_RECON is not set + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set # # SoC audio support @@ -980,7 +1060,7 @@ CONFIG_USB_ETH=m # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set -# CONFIG_USB_PXA2XX_GPIO is not set +CONFIG_USB_PXA2XX_GPIO=y # # MMC/SD Card support @@ -996,8 +1076,11 @@ CONFIG_MMC_PXA=y # Real Time Clock # CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=m -CONFIG_RTC_EPOCH=1970 +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_EPOCH=1904 +# CONFIG_RTC_DEBUG is not set # # RTC interfaces @@ -1011,9 +1094,15 @@ CONFIG_RTC_INTF_DEV=m # RTC drivers # # CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set # CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=m # CONFIG_RTC_DRV_TEST is not set @@ -1026,8 +1115,11 @@ CONFIG_RTC_DRV_SA1100=m CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb index fdae8f4ec1..b76fbbb317 100644 --- a/packages/linux/linux-hackndev-2.6_svn.bb +++ b/packages/linux/linux-hackndev-2.6_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." HOMEPAGE = "http://www.hackndev.com/" SECTION = "kernel" LICENSE = "GPL" -PR = "r9" +PR = "r11" COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)" diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6/h2200/defconfig index 85a7ae0e6e..9b72b0bd9d 100644 --- a/packages/linux/linux-handhelds-2.6/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6/h2200/defconfig @@ -729,9 +729,9 @@ CONFIG_FIXED_MII_100_FDX=y # CONFIG_NET_ETHERNET=y CONFIG_MII=m -CONFIG_SMC91X=m +# CONFIG_SMC91X is not set CONFIG_DM9000=m -CONFIG_SMC911X=m +# CONFIG_SMC911X is not set # # Ethernet (1000 Mbit) diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index 46f71376b1..b7a728521b 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -2,12 +2,10 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/pim" DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio" PV = "0.1.0+svn${SVNREV}" -PR = "r4" +PR = "r5" inherit openmoko2 -SRC_URI += "file://openmoko-dialer.patch;patch=1" - EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/" diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb index ebe234aca5..9824fd3d79 100644 --- a/packages/openocd/openocd_svn.bb +++ b/packages/openocd/openocd_svn.bb @@ -9,4 +9,4 @@ SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \ file://openocd-link-static.patch;patch=1" S = "${WORKDIR}/trunk" -EXTRA_OECONF = " --disable-ftdi2232 --disable-ftd2xx" +EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx" diff --git a/packages/tasks/task-sdl.bb b/packages/tasks/task-sdl.bb index de457c7e3e..3cda723e87 100644 --- a/packages/tasks/task-sdl.bb +++ b/packages/tasks/task-sdl.bb @@ -1,15 +1,64 @@ DESCRIPTION = "Tasks for SDL stuff" LICENSE = "MIT" -PR = "r1" +PR = "r2" inherit task -PACKAGES = "task-sdl-libs task-sdl-games task-sdl-emulators" +PACKAGES = "\ + task-sdl-libs \ + task-sdl-games \ + task-sdl-emulators \ +# task-sdl-misc \ +" # no need to add libsdl as all libsdl-* already rdepend on it -RDEPENDS_task-sdl-libs = "libsdl-gfx libsdl-image libsdl-mixer libsdl-ttf libsdl-net" +RDEPENDS_task-sdl-libs = "\ + libsdl-gfx \ + libsdl-image \ + libsdl-mixer \ + libsdl-ttf \ + libsdl-net \ +" + +RDEPENDS_task-sdl-games = "\ + abuse \ + crimsonfields \ + freedroid \ + frozen-bubble \ + lbreakout2 \ + nogravity \ + horizon \ + openttd \ + prboom \ + quake1 \ + quetoo \ + rocksndiamonds \ + rott \ + supertux \ + uqm \ + xmame \ + " + +RDEPENDS_task-sdl-emulators = "\ + dgen-sdl \ + dosbox \ + e-uae \ + fceu \ + frodo \ + scummvm \ + snes9x \ +" + +RDEPENDS_task-sdl-others = "\ + synaestehsia \ + chibitracker \ + gnash \ + midpath \ +" + +# ./powermanga/powermanga_0.79.bb:DEPENDS = "libsdl-qpe libsdl-mixer" + + -RDEPENDS_task-sdl-games = "abuse freedroid lbreakout2 openttd prboom quake1 rott supertux xmame" -RDEPENDS_task-sdl-emulators = "dgen-sdl e-uae frodo snes9x" |