diff options
Diffstat (limited to 'packages')
105 files changed, 1044 insertions, 461 deletions
diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb index b58aa41756..d5fb0cff21 100644 --- a/packages/apache2/apache2-native_2.2.3.bb +++ b/packages/apache2/apache2-native_2.2.3.bb @@ -1,9 +1,9 @@ SECTION = "net" DEPENDS = "expat pcre" -inherit native +inherit cross -PR="r5" +PR="r6" SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2" S = "${WORKDIR}/httpd-${PV}" diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab index 4a0cc7750d..e5acb6a1eb 100644 --- a/packages/base-files/base-files/fic-gta01/fstab +++ b/packages/base-files/base-files/fic-gta01/fstab @@ -6,10 +6,8 @@ proc /proc proc defaults 0 0 # usb? # Temporary -tmpfs /tmp tmpfs defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 -tmpfs /media/ram tmpfs defaults 0 0 # microSD slot /dev/mmcblk0p1 /media/card auto defaults,async,noauto 0 0 diff --git a/packages/base-files/base-files/fic-gta02/fstab b/packages/base-files/base-files/fic-gta02/fstab index 4a0cc7750d..e5acb6a1eb 100644 --- a/packages/base-files/base-files/fic-gta02/fstab +++ b/packages/base-files/base-files/fic-gta02/fstab @@ -6,10 +6,8 @@ proc /proc proc defaults 0 0 # usb? # Temporary -tmpfs /tmp tmpfs defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 -tmpfs /media/ram tmpfs defaults 0 0 # microSD slot /dev/mmcblk0p1 /media/card auto defaults,async,noauto 0 0 diff --git a/packages/binutils/binutils-cross-sdk_2.18.bb b/packages/binutils/binutils-cross-sdk_2.18.bb index a045d9bc9c..81c84229b0 100644 --- a/packages/binutils/binutils-cross-sdk_2.18.bb +++ b/packages/binutils/binutils-cross-sdk_2.18.bb @@ -5,7 +5,9 @@ DEPENDS += "flex-native bison-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \ --program-prefix=${TARGET_PREFIX}" -PR = "r2" +PR = "r3" + +FILES_${PN}-dbg += "${prefix}/${TARGET_SYS}/bin/.debug" do_stage() { : diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass index 0cb8497733..a859ac2ca9 100644 --- a/packages/glibc/eglibc-package.bbclass +++ b/packages/glibc/eglibc-package.bbclass @@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0" BINARY_LOCALE_ARCHES ?= "arm.*" PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" -PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*" +PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*" RPROVIDES_eglibc = "glibc" RPROVIDES_eglibc-utils = "glibc-utils" @@ -210,6 +210,7 @@ python package_do_split_gconvs () { f.close() if deps != []: bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group, d) do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d) @@ -261,6 +262,7 @@ python package_do_split_gconvs () { else: eglibc_name = name bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d) + bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % group, d) rprovides = 'virtual-locale-%s' % legitimize_package_name(name) m = re.match("(.*)_(.*)", name) if m: diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index da33cca3fa..ff68185bcc 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -2,8 +2,8 @@ require glibc.inc DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" -PV = "2.6+svnr${SRCREV}" -PR = "r1" +PV = "2.7+svnr${SRCREV}" +PR = "r2" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://etc/ld.so.conf \ file://generate-supported.mk" diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index cc69079c3a..e7875dc72e 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -7,7 +7,7 @@ RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" PV = "2.16.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ file://69gconfd-dbus" @@ -19,6 +19,7 @@ PARALLEL_MAKE = "" FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug" +FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd" EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static" diff --git a/packages/zroadmap/.mtn2git_empty b/packages/gnome/libart-lgpl/armeb/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/zroadmap/.mtn2git_empty +++ b/packages/gnome/libart-lgpl/armeb/.mtn2git_empty diff --git a/packages/gnome/libart-lgpl/armeb/art_config.h b/packages/gnome/libart-lgpl/armeb/art_config.h new file mode 100644 index 0000000000..b0e74ad6ae --- /dev/null +++ b/packages/gnome/libart-lgpl/armeb/art_config.h @@ -0,0 +1,10 @@ +/* Automatically generated by gen_art_config.c */ + +#define ART_SIZEOF_CHAR 1 +#define ART_SIZEOF_SHORT 2 +#define ART_SIZEOF_INT 4 +#define ART_SIZEOF_LONG 4 + +typedef unsigned char art_u8; +typedef unsigned short art_u16; +typedef unsigned int art_u32; diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb index 1efcd793e0..204f7828f9 100644 --- a/packages/gpephone/gpe-applauncher_0.11.bb +++ b/packages/gpephone/gpe-applauncher_0.11.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r1" +PR = "r2" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" @@ -18,7 +18,7 @@ inherit gpephone autotools SRC_URI += "file://hotkeys.conf \ file://softkeys.conf" -EXTRA_OECONF = "--disable-gridlayout" +EXTRA_OECONF = "--enable-gridlayout" FILES_${PN} = '${datadir} ${bindir}' FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' diff --git a/packages/gpephone/gpe-applauncher_svn.bb b/packages/gpephone/gpe-applauncher_svn.bb index 4fe82877e3..311d2eef60 100644 --- a/packages/gpephone/gpe-applauncher_svn.bb +++ b/packages/gpephone/gpe-applauncher_svn.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" PV = "0.11+svn-${SRCREV}" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" @@ -24,7 +24,7 @@ RDEPENDS_${PN} += "gpe-applauncher-config" SRC_URI += "file://hotkeys.conf \ file://softkeys.conf" -EXTRA_OECONF = "--disable-gridlayout" +EXTRA_OECONF = "--enable-gridlayout" FILES_${PN} = '${datadir} ${bindir}' FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' diff --git a/packages/gtk-webcore/midori_0.0.13.bb b/packages/gtk-webcore/midori_0.0.13.bb new file mode 100644 index 0000000000..23d0179375 --- /dev/null +++ b/packages/gtk-webcore/midori_0.0.13.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Midori is a lightweight web browser." +LICENSE = "GPLv2" + +DEPENDS = "webkit-gtk libsexy" + +inherit autotools pkgconfig + +SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ + " + + diff --git a/packages/images/base-image.bb b/packages/images/base-image.bb new file mode 100644 index 0000000000..20a5fd9445 --- /dev/null +++ b/packages/images/base-image.bb @@ -0,0 +1,76 @@ +# This image is intended to provide a basic configuration that allows +# you to access a newly flashed device over the network or via the +# native console, and use ipkg to install (from feeds accessible via +# the network) any further features you require into internal flash +# memory or onto attached storage. + +# It should be as small as possible, while still achieving that goal. + +# The rationale for naming it 'base-image' is that this image is the +# base upon which you can install any other functionality you desire. + +# See the end of this file for further rationale and policy regarding +# the contents of this image, and the criteria which are used to make +# decisions about adding and removing packages from this image. + +# Although it is only fully tested with the Angstrom distro, this +# image is intended to be distro-agnostic. + +DISTRO_SSH_DAEMON ?= "dropbear" +DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral" + +DEPENDS = "\ + task-boot \ + task-distro-base task-machine-base \ + ${DISTRO_SSH_DAEMON} \ + ${DISTRO_PACKAGE_MANAGER} \ + task-base-usbhost task-base-ext2 \ + " + +IMAGE_INSTALL = "\ + task-boot \ + task-distro-base task-machine-base \ + ${DISTRO_SSH_DAEMON} \ + ${DISTRO_PACKAGE_MANAGER} \ + task-base-usbhost task-base-ext2 \ + " + +export IMAGE_BASENAME = "base-image" +IMAGE_LINGUAS = "" + +inherit image + +# Key features of this image are: + +# 1) Must be able to mount attached storage devices like SD cards, CF +# cards, internal disks, external USB disks, etc. Should support +# various filesystem choices, but ext2 at a minimum. The rationale +# for this is that you need storage to be able to install significant +# new functionality. + +# 2) Must be able to boot from internal flash, or directly from a +# filesystem stored on the attached storage. The rationale for this +# is that you will want to boot from attached storage instead of +# messing around with ipkg-link. + +# Rationale and policy: + +# 'base-image' is the smallest possible image which allows you to ssh +# into a device via it's native network interface, and install +# packages from feeds across the network into internal flash or onto +# an attached storage device. + +# It is "larger" than minimal-image (which is strictly only that which +# is required to boot and get ssh access to the device, and nothing +# else), but is "smaller" than console-image (which has a whole lot of +# stuff in it which could easily be ipkg installed after boot rather +# than being in the initial rootfs). + +# It is required to always be small enough to fit in the internal +# flash rootfs partition of an NSLU2 (as an example of the smaller end +# of flash sizes that OE supports), and features will be removed from +# the image to ensure that this is always the case. Any feature that +# can be installed over the network using the package manager after +# the first boot is always fair game for removal at any time, and +# patches are welcome to make base-image as small as possible while +# still retaining the ability to subsequently install that feature. diff --git a/packages/images/minimal-gpe-image.bb b/packages/images/minimal-gpe-image.bb index 356070f5f8..3f475567d2 100644 --- a/packages/images/minimal-gpe-image.bb +++ b/packages/images/minimal-gpe-image.bb @@ -6,11 +6,13 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "minimalist-gpe-image" +PR = "r1" + DEPENDS = "task-boot" IMAGE_INSTALL = "\ ${XSERVER} \ task-boot \ - gpe-session-scripts gpe-login \ + gpe-dm gpe-session-scripts gpe-login \ matchbox-wm \ angstrom-feed-configs \ ipkg \ diff --git a/packages/images/minimal-openmoko-image.bb b/packages/images/minimal-openmoko-image.bb new file mode 100644 index 0000000000..6ab4935c24 --- /dev/null +++ b/packages/images/minimal-openmoko-image.bb @@ -0,0 +1,21 @@ +#------------------------------------------------------ +# Minimal OpenMoko Image Recipe +# This should only have the base system + dialer +# #------------------------------------------------------ + +IMAGE_LINGUAS = "" +ANGSTROM_EXTRA_INSTALL ?= "" + +IMAGE_INSTALL = "\ + task-base \ + ${ANGSTROM_EXTRA_INSTALL} \ + task-openmoko-linux \ + task-openmoko-net \ + task-openmoko-ui \ + task-openmoko-base \ + task-openmoko-phone \ + " + +inherit image + +ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' diff --git a/packages/images/nslu2-minimal-image.bb b/packages/images/nslu2-base-image.bb index 5a601b2995..444e9f6a49 100644 --- a/packages/images/nslu2-minimal-image.bb +++ b/packages/images/nslu2-base-image.bb @@ -1,14 +1,14 @@ # Note that this package is intended to create an *identical* -# kernel and rootfs as the normal minimal-image.bb +# kernel and rootfs as the normal base-image.bb # The only reason for the existence of this .bb file is to # create the 8MB and 16MB flashable NSLU2 firmware images. # Please do not add anything other than the following two # lines to this file, and please do not do anything in -# the nslu2-image.bb class which might affect the kernel +# the nslu2-image class which might affect the kernel # or rootfs. -require minimal-image.bb +require base-image.bb inherit nslu2-image diff --git a/packages/initrdscripts/devimage_0.1.bb b/packages/initrdscripts/devimage_0.1.bb index 8eb6fa2d83..08949b9515 100644 --- a/packages/initrdscripts/devimage_0.1.bb +++ b/packages/initrdscripts/devimage_0.1.bb @@ -1,5 +1,6 @@ +DESCRIPTION = "Set of files to initialize bare system suitable for kernel, etc. testing." SRC_URI = "file://devimage.sh file://passwd file://dropbear_rsa_host_key" -PR = "r1" +PR = "r2" do_install() { install -m 0755 ${WORKDIR}/devimage.sh ${D}/init diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb index 002acff0a9..e90247c522 100644 --- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,7 +1,9 @@ SRC_URI = "file://30-bootmenu.sh" -PR = "r3" -RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop" +PR = "r4" DESCRIPTION = "An initramfs module with UI for selection of boot device." +RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop" +# For VFAT mounting. +RRECOMMENDS = "kernel-module-nls-cp437 kernel-module-nls-iso8859-1" do_install() { install -d ${D}/initrd.d diff --git a/packages/linux/em-x270_2.6.23.bb b/packages/linux/em-x270_2.6.23.bb index a9d6ee7905..fcef7280d0 100644 --- a/packages/linux/em-x270_2.6.23.bb +++ b/packages/linux/em-x270_2.6.23.bb @@ -3,8 +3,8 @@ require linux.inc SECTION = "kernel" DESCRIPTION = "Linux kernel for the Compulab EM-X270 system" LICENSE = "GPL" -DEPENDS = "uboot-utils" -PR = "r0" +DEPENDS = "u-boot-utils-native" +PR = "r1" KERNEL_IMAGETYPE = "uImage" diff --git a/packages/linux/linux-bd-neon-2.6_2.6.22.bb b/packages/linux/linux-bd-neon-2.6_2.6.22.bb index 6d2472935f..46fa4295b6 100644 --- a/packages/linux/linux-bd-neon-2.6_2.6.22.bb +++ b/packages/linux/linux-bd-neon-2.6_2.6.22.bb @@ -2,9 +2,9 @@ DESCRIPTION = "2.6 Linux Kernel for Boundary Devices NEON Board" SECTION = "kernel" HOMEPAGE = "N/A" LICENSE = "GPL" -DEPENDS += "uboot-utils" +DEPENDS += "u-boot-utils-native" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \ http://www.boundarydevices.com/boundary-2.6.22-2007-07-22.patch.bz2;patch=1 \ diff --git a/packages/linux/linux-gumstix_2.6.15.bb b/packages/linux/linux-gumstix_2.6.15.bb index 9a9a4d4df3..3e0302fe5f 100644 --- a/packages/linux/linux-gumstix_2.6.15.bb +++ b/packages/linux/linux-gumstix_2.6.15.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Linux Kernel for the Gumstix" SECTION = "kernel" LICENSE = "GPL" -PR = "r1" +PR = "r2" -DEPENDS = "uboot-utils" +DEPENDS = "u-boot-utils-native" COMPATIBLE_MACHINE = "gumstix" diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index f58ef672aa..0db5e93974 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -23,7 +23,7 @@ HHV ?= "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" -KERNEL_FILENAME = "${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}" +KERNEL_FILENAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}.bin" do_configure() { diff --git a/packages/linux/linux-handhelds-2.6/asus620/defconfig b/packages/linux/linux-handhelds-2.6/asus620/defconfig index 6d2f23c72d..04946541d5 100644 --- a/packages/linux/linux-handhelds-2.6/asus620/defconfig +++ b/packages/linux/linux-handhelds-2.6/asus620/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:25 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:42 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1127,7 +1127,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1151,7 +1151,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/asus730/defconfig b/packages/linux/linux-handhelds-2.6/asus730/defconfig index 21d18f02ba..afd7de8af5 100644 --- a/packages/linux/linux-handhelds-2.6/asus730/defconfig +++ b/packages/linux/linux-handhelds-2.6/asus730/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:26 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:43 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1248,7 +1248,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1272,7 +1272,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/aximx50/defconfig b/packages/linux/linux-handhelds-2.6/aximx50/defconfig index e3a31bd3a1..3a610fa2a2 100644 --- a/packages/linux/linux-handhelds-2.6/aximx50/defconfig +++ b/packages/linux/linux-handhelds-2.6/aximx50/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:26 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:43 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1112,7 +1112,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1136,7 +1136,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/eteng500/defconfig b/packages/linux/linux-handhelds-2.6/eteng500/defconfig index a21a83339e..4c1a93ad73 100644 --- a/packages/linux/linux-handhelds-2.6/eteng500/defconfig +++ b/packages/linux/linux-handhelds-2.6/eteng500/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:27 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:44 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1102,7 +1102,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1126,7 +1126,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/h1910/defconfig b/packages/linux/linux-handhelds-2.6/h1910/defconfig index 3c7ebb457d..2e57a63702 100644 --- a/packages/linux/linux-handhelds-2.6/h1910/defconfig +++ b/packages/linux/linux-handhelds-2.6/h1910/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:27 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:44 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1182,7 +1182,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1206,7 +1206,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6/h2200/defconfig index c46793dbe6..667f4f478e 100644 --- a/packages/linux/linux-handhelds-2.6/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:28 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:45 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1583,7 +1583,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1607,7 +1607,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/h3600/defconfig b/packages/linux/linux-handhelds-2.6/h3600/defconfig index b20e9624da..d30992b494 100644 --- a/packages/linux/linux-handhelds-2.6/h3600/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3600/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:28 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:45 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1101,7 +1101,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1125,7 +1125,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/h3800/defconfig b/packages/linux/linux-handhelds-2.6/h3800/defconfig index e23511467a..ffcb91eb32 100644 --- a/packages/linux/linux-handhelds-2.6/h3800/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3800/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:29 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:46 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -954,6 +954,7 @@ CONFIG_MMC=y CONFIG_MMC_BLOCK=y # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set +# CONFIG_MMC_ASIC1 is not set # # Real Time Clock @@ -1098,7 +1099,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1122,7 +1123,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6/h3900/defconfig index d52b267246..dd88630b2d 100644 --- a/packages/linux/linux-handhelds-2.6/h3900/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:29 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:46 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1066,6 +1066,7 @@ CONFIG_MMC_BLOCK=y # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set CONFIG_MMC_ASIC3=y +# CONFIG_MMC_ASIC1 is not set # # Real Time Clock @@ -1216,7 +1217,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1240,7 +1241,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6/h4000/defconfig index 1f47995434..f04dad63cb 100644 --- a/packages/linux/linux-handhelds-2.6/h4000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h4000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:30 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:47 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -158,12 +158,9 @@ CONFIG_BOARD_IRQ_MAP_BIG=y # CONFIG_MACH_H3900 is not set CONFIG_MACH_H4000=y CONFIG_MACH_H4300=y -CONFIG_IPAQ_H4000_IRDA=m CONFIG_IPAQ_H4000_LCD=y CONFIG_IPAQ_H4000_BACKLIGHT=y CONFIG_IPAQ_H4000_PCMCIA=y -# CONFIG_IPAQ_H4000_BUTTONS is not set -CONFIG_IPAQ_H4000_LEDS=y CONFIG_IPAQ_H4000_BT=m CONFIG_IPAQ_H4300_KBD=y # CONFIG_MACH_H4700 is not set @@ -1340,7 +1337,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1364,7 +1361,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/h5000/defconfig b/packages/linux/linux-handhelds-2.6/h5000/defconfig index 8beab42a17..004c26cf3b 100644 --- a/packages/linux/linux-handhelds-2.6/h5000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h5000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:30 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:47 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1218,7 +1218,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1242,7 +1242,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/htcalpine/defconfig b/packages/linux/linux-handhelds-2.6/htcalpine/defconfig index cc6ea81fbc..ad409c78b0 100644 --- a/packages/linux/linux-handhelds-2.6/htcalpine/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcalpine/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:31 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:49 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1122,7 +1122,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1146,7 +1146,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/htcapache/defconfig b/packages/linux/linux-handhelds-2.6/htcapache/defconfig index 85ff1a53d7..8ffb03322b 100644 --- a/packages/linux/linux-handhelds-2.6/htcapache/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcapache/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:32 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:49 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1208,7 +1208,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1232,7 +1232,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/htcbeetles/defconfig b/packages/linux/linux-handhelds-2.6/htcbeetles/defconfig index df6c1c827d..db1f76fbfa 100644 --- a/packages/linux/linux-handhelds-2.6/htcbeetles/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcbeetles/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:32 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:50 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1129,7 +1129,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1153,7 +1153,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig b/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig index 690c3d5993..edf57d037b 100644 --- a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:33 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:50 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1140,6 +1140,7 @@ CONFIG_SND_PXA2XX_SOC_BLUEANGEL=m # CONFIG_SND_SOC_WM8976 is not set # CONFIG_SND_SOC_WM8974 is not set # CONFIG_SND_SOC_WM8980 is not set +# CONFIG_SND_SOC_WM9705 is not set # CONFIG_SND_SOC_WM9713 is not set # CONFIG_SND_SOC_WM9712 is not set CONFIG_SND_SOC_UDA1380=m @@ -1363,7 +1364,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1387,7 +1388,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig b/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig index 5389f69e7a..d67400b02b 100644 --- a/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig +++ b/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:33 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:51 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1125,7 +1125,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1149,7 +1149,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/htcsable/defconfig b/packages/linux/linux-handhelds-2.6/htcsable/defconfig index ebdd7b8e9f..d81cb02201 100644 --- a/packages/linux/linux-handhelds-2.6/htcsable/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcsable/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:34 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:51 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1235,7 +1235,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1259,7 +1259,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig index 9a9c2451a1..c8ee782d61 100644 --- a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:34 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:52 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -172,6 +172,7 @@ CONFIG_HTCUNIVERSAL_BUTTONS=y CONFIG_HTCUNIVERSAL_BLUETOOTH=m CONFIG_HTCUNIVERSAL_ASIC3_LEDS=y CONFIG_HTCUNIVERSAL_PHONE=m +# CONFIG_HTCUNIVERSAL_MDOC_G3 is not set CONFIG_HTCUNIVERSAL_AK4641=m # CONFIG_MACH_HTCALPINE is not set # CONFIG_MACH_MAGICIAN is not set @@ -1243,7 +1244,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1267,7 +1268,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig b/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig index 6b7f91d4d4..13038ab67e 100644 --- a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:35 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:52 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1100,7 +1100,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1124,7 +1124,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6/hx4700/defconfig index 90ecb03be0..9a4f7cb072 100644 --- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6/hx4700/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:31 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:48 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1060,7 +1060,7 @@ CONFIG_ADC_ADS7846_SSP=y # CONFIG_HTC_ASIC2 is not set CONFIG_HTC_ASIC3=y # CONFIG_HTC_PASIC3 is not set -# CONFIG_HTC_EGPIO is not set +CONFIG_HTC_EGPIO=y # CONFIG_HTC_BBKEYS is not set CONFIG_HTC_ASIC3_DS1WM=y # CONFIG_SOC_SAMCOP is not set @@ -1600,7 +1600,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1624,7 +1624,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/looxc550/defconfig b/packages/linux/linux-handhelds-2.6/looxc550/defconfig index 57d2552651..48eee4b67f 100644 --- a/packages/linux/linux-handhelds-2.6/looxc550/defconfig +++ b/packages/linux/linux-handhelds-2.6/looxc550/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:35 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:53 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1125,7 +1125,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1149,7 +1149,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index 6817d85f2d..47a436084a 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:31 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:48 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1129,6 +1129,7 @@ CONFIG_SND_PXA2XX_SOC_MAGICIAN=m # CONFIG_SND_SOC_WM8976 is not set # CONFIG_SND_SOC_WM8974 is not set # CONFIG_SND_SOC_WM8980 is not set +# CONFIG_SND_SOC_WM9705 is not set # CONFIG_SND_SOC_WM9713 is not set # CONFIG_SND_SOC_WM9712 is not set CONFIG_SND_SOC_UDA1380=m @@ -1453,7 +1454,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1477,7 +1478,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/rx1950/defconfig b/packages/linux/linux-handhelds-2.6/rx1950/defconfig index 01317611b0..2f5423c28a 100644 --- a/packages/linux/linux-handhelds-2.6/rx1950/defconfig +++ b/packages/linux/linux-handhelds-2.6/rx1950/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:36 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:53 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1159,7 +1159,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1183,7 +1183,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6/rx3000/defconfig b/packages/linux/linux-handhelds-2.6/rx3000/defconfig index 3096d39118..0100f9b641 100644 --- a/packages/linux/linux-handhelds-2.6/rx3000/defconfig +++ b/packages/linux/linux-handhelds-2.6/rx3000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh17 -# Sun Nov 11 00:39:36 2007 +# Linux kernel version: 2.6.21-hh19 +# Thu Dec 13 13:04:54 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1071,6 +1071,7 @@ CONFIG_SND_S3C24XX_SOC_RX3000=m # CONFIG_SND_SOC_WM8976 is not set # CONFIG_SND_SOC_WM8974 is not set # CONFIG_SND_SOC_WM8980 is not set +# CONFIG_SND_SOC_WM9705 is not set # CONFIG_SND_SOC_WM9713 is not set # CONFIG_SND_SOC_WM9712 is not set CONFIG_SND_SOC_UDA1380=m @@ -1276,7 +1277,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1300,7 +1301,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb index ec5844bfb5..ae3741e872 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r1" +PR = "r3" DEFAULT_PREFERENCE = "-1" diff --git a/packages/linux/linux-omap.inc b/packages/linux/linux-omap.inc index 83f134b878..52b0d27a6d 100644 --- a/packages/linux/linux-omap.inc +++ b/packages/linux/linux-omap.inc @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for OMAP processors" LICENSE = "GPL" #DEPENDS = ${@['u-boot','u-boot-omap2430sdp'][bb.data.getVar('MACHINE',d,1) == 'omap2430sdp']} -DEPENDS = uboot-utils +DEPENDS = "u-boot-utils-native" inherit kernel diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc index d08169999c..b659153733 100644 --- a/packages/linux/linux-openmoko.inc +++ b/packages/linux/linux-openmoko.inc @@ -1,5 +1,4 @@ # extra stuff we need for openmoko that is not in linux.inc - do_deploy_append() { mv ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin @@ -7,3 +6,17 @@ do_deploy_append() { ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_CLASS}-latest.bin } +RDEPENDS_kernel-image += "mtd-utils" + +pkg_postinst_kernel-image () { +if test "x$D" != "x"; then + exit 1 +else + echo "Upgrading Kernel in Flash" + echo "DO NOT stop this process" + + ${bindir}/flash_eraseall ${MTD_KERNEL_PARTITION} + ${bindir}/nandwrite -p ${MTD_KERNEL_PARTITION} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} +fi +} + diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb index c623504c73..d1b3c5ef1e 100644 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ b/packages/linux/linux-openmoko_2.6.22.5.bb @@ -37,7 +37,6 @@ S = "${WORKDIR}/linux-${VANILLA_VERSION}" ############################################################## # kernel image resides on a seperate flash partition (for now) # -FILES_kernel-image = "" ALLOW_EMPTY = "1" COMPATIBLE_HOST = "arm.*-linux" diff --git a/packages/linux/linux-turbostation_2.6.20.2.bb b/packages/linux/linux-turbostation_2.6.20.2.bb index 84701e4a6a..91080752fc 100644 --- a/packages/linux/linux-turbostation_2.6.20.2.bb +++ b/packages/linux/linux-turbostation_2.6.20.2.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform" SECTION = "kernel" LICENSE = "GPL" -DEPENDS = "uboot-utils" -PR = "r1" +DEPENDS = "u-boot-utils-native" +PR = "r2" COMPATIBLE_MACHINE = "turbostation" diff --git a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch index 3a09ac5bc2..c25aa74ca4 100644 --- a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch +++ b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch @@ -1,12 +1,12 @@ Index: matchbox-keyboard/src/matchbox-keyboard.c =================================================================== ---- matchbox-keyboard.orig/src/matchbox-keyboard.c 2007-08-19 17:26:59.000000000 +0200 -+++ matchbox-keyboard/src/matchbox-keyboard.c 2007-08-19 17:27:06.000000000 +0200 -@@ -52,7 +52,7 @@ +--- matchbox-keyboard.orig/src/matchbox-keyboard.c ++++ matchbox-keyboard/src/matchbox-keyboard.c +@@ -54,7 +54,7 @@ kb->row_spacing = 5; kb->font_family = strdup("sans"); -- kb->font_pt_size = 5; +- kb->font_pt_size = 6; + kb->font_pt_size = 3; kb->font_variant = strdup("bold"); diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index 2b84a19bd7..4384b6db7d 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -3,21 +3,21 @@ LICENSE = "GPL" DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" RCONFLICTS_${PN} = "matchbox-keyboard" RPROVIDES_${PN} = "matchbox-keyboard" -#DEFAULT_PREFERENCE = "-1" SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR = "r9" +PR = "r10" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ - file://smallscreen-fontsize.patch;patch=1 \ + file://smallscreen-fontsize.patch;patch=1 \ file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ file://4-Add-rendering-debug-logging.patch;patch=1 \ file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \ file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \ - file://80matchboxkeyboard" + file://80matchboxkeyboard" SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1" +SRC_URI_append_fic-gta02 = " file://fic-gta01-font-size.patch;patch=1" S = "${WORKDIR}/matchbox-keyboard" diff --git a/packages/meta/meta-angstrom-2007.bb b/packages/meta/meta-angstrom-2007.bb new file mode 100644 index 0000000000..a3a2c78a79 --- /dev/null +++ b/packages/meta/meta-angstrom-2007.bb @@ -0,0 +1,32 @@ +# Meta file to inform the autobuilder which packages to build for the feeds +# Any changes should be discussed first on the angstrom-distro-devel mailinglist + +# Try to keep it alphabetically sorted please + +inherit meta + +RDEPENDS = "" + +# Basic tools +RDEPENDS += " \ + task-proper-tools \ + screen \ + " + +# Browsers know to work on all archs +RDEPENDS += " \ + gpe-mini-browser \ + midori \ + minimo \ + openmoko-browser2 \ + webkit-gtklauncher \ + " + +# Webservers +RDEPENDS += " \ + apache2 \ + boa \ + cherokee \ + lighttpd \ + thttpd \ + " diff --git a/packages/mono/files/mono-libgc-configure.patch b/packages/mono/files/mono-libgc-configure.patch new file mode 100644 index 0000000000..641635da3c --- /dev/null +++ b/packages/mono/files/mono-libgc-configure.patch @@ -0,0 +1,20 @@ +Index: mono-1.2.6/libgc/configure.in +=================================================================== +--- mono-1.2.6.orig/libgc/configure.in 2007-12-12 15:02:31.000000000 -0500 ++++ mono-1.2.6/libgc/configure.in 2007-12-12 15:05:10.000000000 -0500 +@@ -17,6 +17,15 @@ + AC_PREREQ(2.53) + AC_INIT(libgc-mono, 6.6, Hans_Boehm@hp.com) + ++# the following is a very strange bug. CPPFLAGS does not get set correctly ++# if CPPFLAGS is set in the environment. The top level configure script ++# appends to the CPPFLAGS variable, and then exports it. This change should ++# be picked up by this configure script, but it is not. The original ++# env variable is still used for some reason. If CPPFLAGS is not set in the ++# environment, everything works fine. ++# Someone more experienced with autoconf will have to come up with a better fix. ++CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DUSE_COMPILER_TLS" ++echo "CPPFLAGS verify: start of libgc/configure.in, CPPFLAGS = $CPPFLAGS" + AM_INIT_AUTOMAKE(libgc-mono, 6.6, no-define) + + AC_CONFIG_SRCDIR(gcj_mlc.c) diff --git a/packages/zroadmap/files/.mtn2git_empty b/packages/mono/mono-1.2.6/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/zroadmap/files/.mtn2git_empty +++ b/packages/mono/mono-1.2.6/.mtn2git_empty diff --git a/packages/mono/mono-1.2.6/configure.patch b/packages/mono/mono-1.2.6/configure.patch new file mode 100644 index 0000000000..f033248621 --- /dev/null +++ b/packages/mono/mono-1.2.6/configure.patch @@ -0,0 +1,23 @@ +Index: mono-1.2.6/configure.in +=================================================================== +--- mono-1.2.6.orig/configure.in 2007-11-08 17:07:57.000000000 -0500 ++++ mono-1.2.6/configure.in 2007-12-12 15:27:52.000000000 -0500 +@@ -1150,6 +1150,8 @@ + ], [ + AC_MSG_RESULT(no) + with_tls=pthread ++ ], [ ++ AC_MSG_RESULT(yes) + ]) + fi + +@@ -1252,6 +1254,9 @@ + ], [ + with_sigaltstack=no + AC_MSG_RESULT(no) ++ ], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) + ]) + fi + diff --git a/packages/mono/mono-mcs-intermediate_1.2.6.bb b/packages/mono/mono-mcs-intermediate_1.2.6.bb new file mode 100644 index 0000000000..53ff1b25aa --- /dev/null +++ b/packages/mono/mono-mcs-intermediate_1.2.6.bb @@ -0,0 +1,10 @@ +# This is a straw-man recipe for step 1 in the two-step build of +# mono. Because it's impossible to build the mcs directory +# in cross-compile mode, this recipe will do a native build, +# then tar the resulting install tree for usage by the mono +# package in step 2. +# See http://www.mono-project.com/Mono:ARM + +require mono_1.2.6.inc +require mono-mcs-intermediate.inc + diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb new file mode 100644 index 0000000000..5c5d8476bb --- /dev/null +++ b/packages/mono/mono_1.2.6.bb @@ -0,0 +1,78 @@ +require mono_1.2.6.inc + +DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" + +PR = "r1" + +SRC_URI += "file://configure.patch;patch=1" + +# Per http://www.mono-project.com/Mono:ARM +EXTRA_OECONF += " --disable-mcs-build " +# Instead, get the mcs tree from a different build (see mono-mcs-intermediate) + +do_install_prepend() { + install -d ${D} + pushd ${D} + tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + popd +} + +do_install_append() { + # mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#), + # however, jay is not being cross-compiled and thus only + # available for the buildhost architecture, so remove it + # entirely + pushd ${D} + rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ + ./usr/share/jay/README.jay \ + ./usr/bin/jay + popd + + # Not packaged with the default rules and apparently + # not used for anything + rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml +} + +inherit mono + +# Import file definitions from Debian +require mono_1.2.5.1-files.inc + +# Add some packages +PACKAGES_append = " mono-doc mono mono-runtime" + +FILES_mono-doc_append = " /usr/share/libgc-mono/ " + +FILES_mono = "" +ALLOW_EMPTY_mono = "1" +RDEPENDS_mono = "mono-common mono-jit" + +FILES_mono-runtime = "" +ALLOW_EMPTY_mono-runtime = "1" +RDEPENDS_mono-runtime = "mono-jit mono-gac" + +RDEPENDS_mono-jit = "mono-common" + +FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \ + /usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la" +FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \ + /usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so" + +# Packages not included in Debian +PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \ + libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \ + libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil" + +FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll" +FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc" +FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb" + +FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*" +FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb" + +FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll" +FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb" + +# Move .pc files +FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc" +PACKAGES =+ " libmono-cairo1.0-cil-dev " diff --git a/packages/mono/mono_1.2.6.inc b/packages/mono/mono_1.2.6.inc new file mode 100644 index 0000000000..c9644cbce5 --- /dev/null +++ b/packages/mono/mono_1.2.6.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Mono Programming Language" +SECTION = "devel/mono" +LICENSE = "GPL LGPL X11" + +SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2 \ + file://mono-libgc-configure.patch;patch=1" + +S = "${WORKDIR}/mono-1.2.6" + +inherit autotools +EXTRA_OECONF_arm = "--without-tls" +EXTRA_OECONF_mipsel = "--without-tls" + diff --git a/packages/octave/octave_2.9.17.bb b/packages/octave/octave_2.9.19.bb index 5473e0d99e..b92a181754 100644 --- a/packages/octave/octave_2.9.17.bb +++ b/packages/octave/octave_2.9.19.bb @@ -11,15 +11,15 @@ PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \ FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*" FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so" -FILES_libcruft-dbg = "${libdir}/${PN}-${PV}/.debug/libcruft*" +FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*" FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*" FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so" -FILES_liboctave-dbg = "${libdir}/${PN}-${PV}/.debug/liboctave*" +FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*" FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*" FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so" -FILES_liboctinterp-dbg = "${libdir}/${PN}-${PV}/.debug/liboctinterp*" +FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*" # octave-oct provides subroutines in .oct file format FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct" diff --git a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb index b96cf8fa74..1526cbab55 100644 --- a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb +++ b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb @@ -4,7 +4,7 @@ PACKAGE_ARCH = "all" SRC_URI = "svn://svn.openmoko.org/developers/john_lee;module=toolkit;proto=http" SRC_URI += "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=openmoko-sample2;proto=http" -SRCREV="3563" +SRCREV="3630" FILES_${PN} = "/" do_install () { diff --git a/packages/pointercal/files/e680/.mtn2git_empty b/packages/pointercal/files/e680/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pointercal/files/e680/.mtn2git_empty diff --git a/packages/pointercal/files/e680/pointercal b/packages/pointercal/files/e680/pointercal new file mode 100644 index 0000000000..8b0651dd21 --- /dev/null +++ b/packages/pointercal/files/e680/pointercal @@ -0,0 +1 @@ +-19857 -412 18085522 189 -23922 22734294 65536 diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb index 4fa8c1cc0e..e79ee0b889 100644 --- a/packages/pointercal/pointercal_0.0.bb +++ b/packages/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r4" +PR = "r5" SRC_URI = "file://pointercal" S = "${WORKDIR}" diff --git a/packages/python/python-pyqt_4.3.1.bb b/packages/python/python-pyqt_4.3.3.bb index d9c45ec14c..74a16c4720 100644 --- a/packages/python/python-pyqt_4.3.1.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -22,7 +22,8 @@ inherit qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +# NOTE: match with qt version we have in OE +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb index 84df0ef732..d9071193a9 100644 --- a/packages/qmake/qmake2-native_2.10a.bb +++ b/packages/qmake/qmake2-native_2.10a.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL" -PR = "r1" +PR = "r2" QTVER = "qtopia-core-opensource-src-4.3.2" @@ -15,7 +15,7 @@ S = "${WORKDIR}/${QTVER}" # we need the real target system here CROSS_SYS := "${TARGET_SYS}" -inherit autotools native +inherit autotools cross export QTDIR = "${S}" EXTRA_OEMAKE = "-e" diff --git a/packages/roadmap/files/qt/.mtn2git_empty b/packages/roadmap/files/qt/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/roadmap/files/qt/.mtn2git_empty diff --git a/packages/roadmap/files/qt/qt2-fixes.patch b/packages/roadmap/files/qt/qt2-fixes.patch new file mode 100644 index 0000000000..63c1c96e53 --- /dev/null +++ b/packages/roadmap/files/qt/qt2-fixes.patch @@ -0,0 +1,10 @@ +--- src/qt/Makefile~qt2-fixes.patch ++++ src/qt/Makefile +@@ -19,7 +19,7 @@ + + ifeq ($(DESKTOP),QPE) + CFLAGS += -I$(QTDIR)/include -DQWS +- LIBS += -lqte -lqpe ++ LIBS += -lqpe + INSTALLDIR=$(QTDIR) + endif diff --git a/packages/roadmap/files/qt/qt_canvas.patch b/packages/roadmap/files/qt/qt_canvas.patch new file mode 100644 index 0000000000..13c775c8cb --- /dev/null +++ b/packages/roadmap/files/qt/qt_canvas.patch @@ -0,0 +1,20 @@ +--- src/qt/qt_canvas.cc.old 2007-12-08 20:29:52.000000000 -0600 ++++ src/qt/qt_canvas.cc 2007-12-13 02:34:22.000000000 -0600 +@@ -122,7 +122,7 @@ void RMapCanvas::getTextExtents(const ch + *w = r.width(); + *ascent = fm.ascent(); + *descent = fm.descent(); +-#ifdef QT_NO_ROTATE ++#ifdef QT_NO_TRANSFORMATIONS + if (can_tilt) *can_tilt = 0; + #else + if (can_tilt) *can_tilt = 1; +@@ -169,7 +169,7 @@ void RMapCanvas::drawString(RoadMapGuiPo + + void RMapCanvas::drawStringAngle(RoadMapGuiPoint* position, + int center, const char* text, int angle) { +-#ifndef QT_NO_ROTATE ++#ifndef QT_NO_TRANSFORMATIONS + if (!pixmap) { + return; + } diff --git a/packages/roadmap/files/qt/qt_main.patch b/packages/roadmap/files/qt/qt_main.patch new file mode 100644 index 0000000000..2f81128b34 --- /dev/null +++ b/packages/roadmap/files/qt/qt_main.patch @@ -0,0 +1,61 @@ +--- src/qt/qt_main.cc.old 2007-12-08 20:32:34.000000000 -0600 ++++ src/qt/qt_main.cc 2007-12-08 20:34:38.000000000 -0600 +@@ -27,6 +27,7 @@ + #include <signal.h> + #include <sys/types.h> + #include <sys/socket.h> ++#include <unistd.h> + #include "qt_main.h" + + static int signalFd[2]; +@@ -168,12 +169,6 @@ void RMapMainWindow::addTool(const char* + const char* tip, + RoadMapCallback callback) { + +-#ifndef QWS +- // For some unknown reason, this toolbar crashes RoadMap +- // on the Sharp Zaurus. +- // This should be fixed and the ifndef removed. +- // Pascal: I believe this has been fixed now. +- + if (toolBar == 0) { + addToolbar(""); + } +@@ -193,20 +188,13 @@ void RMapMainWindow::addTool(const char* + + connect(b, SIGNAL(clicked()), cb, SLOT(fire())); + } +-#endif + } + + void RMapMainWindow::addToolSpace(void) { + +-#ifndef QWS +- // For some unknown reason, this toolbar crashes RoadMap +- // on the Sharp Zaurus. This should be fixed and the ifndef +- // removed. +- + addTool (NULL, NULL, NULL, NULL); + + toolBar->addSeparator(); +-#endif + } + + +@@ -299,14 +287,14 @@ void RMapMainWindow::closeEvent(QCloseEv + + void RMapMainWindow::signalHandler(int sig) + { +- ::write(signalFd[0], &sig, sizeof(sig)); ++ write(signalFd[0], &sig, sizeof(sig)); + } + + void RMapMainWindow::handleSignal() + { + snSignal->setEnabled(false); + int tmp; +- ::read(signalFd[1], &tmp, sizeof(tmp)); ++ read(signalFd[1], &tmp, sizeof(tmp)); + QString action; + switch (tmp) { + case SIGTERM: action="SIGTERM"; break; diff --git a/packages/roadmap/files/qt/roadmap.desktop.patch b/packages/roadmap/files/qt/roadmap.desktop.patch new file mode 100644 index 0000000000..98d5b06130 --- /dev/null +++ b/packages/roadmap/files/qt/roadmap.desktop.patch @@ -0,0 +1,16 @@ +--- src/roadmap.desktop.old 2007-12-08 23:15:45.000000000 -0600 ++++ src/roadmap.desktop 2007-12-08 23:17:48.000000000 -0600 +@@ -1,11 +1,8 @@ + [Desktop Entry] +-Comment=RoadMap + Comment=Car Navigation System + Exec=roadmap +-Icon=roadmap.png ++Icon=roadmap + Type=Application + Name=RoadMap + GenericName=Map Viewer +-Categories=Application;Other;VectorGraphics;Graphics;Viewer;GTK; +-FilePattern=*roadmap;*.rdm +- ++Categories=VectorGraphics;Graphics;Viewer;GTK; diff --git a/packages/roadmap/files/qt/roadmap_main.patch b/packages/roadmap/files/qt/roadmap_main.patch new file mode 100644 index 0000000000..7b16ce28fc --- /dev/null +++ b/packages/roadmap/files/qt/roadmap_main.patch @@ -0,0 +1,16 @@ +--- src/qt/roadmap_main.cc.old 2007-12-08 15:47:05.000000000 -0600 ++++ src/qt/roadmap_main.cc 2007-12-07 20:39:15.000000000 -0600 +@@ -195,11 +195,11 @@ void roadmap_main_set_cursor (int newcur + break; + + case ROADMAP_CURSOR_WAIT: +- mainWindow->setCursor (QCursor(Qt::WaitCursor)); ++ mainWindow->setCursor (QCursor(Qt::waitCursor)); + break; + + case ROADMAP_CURSOR_CROSS: +- mainWindow->setCursor (QCursor(Qt::CrossCursor)); ++ mainWindow->setCursor (QCursor(Qt::crossCursor)); + break; + } + } diff --git a/packages/zroadmap/files/zroadgps.png b/packages/roadmap/files/zroadgps.png Binary files differindex a77b3729b7..a77b3729b7 100644 --- a/packages/zroadmap/files/zroadgps.png +++ b/packages/roadmap/files/zroadgps.png diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb index cb81a44ae8..557c4a1096 100644 --- a/packages/roadmap/roadmap-gtk2_cvs.bb +++ b/packages/roadmap/roadmap-gtk2_cvs.bb @@ -1,13 +1,8 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection." -AUTHOR = "Pascal Martin <pascal.martin@iname.com>" -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -DEPENDS = "popt expat gtk+" -LICENSE = "GPL" +require roadmap.inc + +DEPENDS = "expat gtk+" PV = "1.0.12+cvs${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ @@ -16,7 +11,6 @@ SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ S = "${WORKDIR}/roadmap/src" -PARALLEL_MAKE = "" CFLAGS += " -I${S} " @@ -39,6 +33,5 @@ do_install() { install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ } - FILES_${PN} += "${datadir}/roadmap" diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc new file mode 100644 index 0000000000..43577badb9 --- /dev/null +++ b/packages/roadmap/roadmap.inc @@ -0,0 +1,7 @@ +DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX." +PRIORITY = "optional" +AUTHOR = "Pascal Martin <pascal.martin@iname.com>" +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" +LICENSE = "GPL" + +PARALLEL_MAKE = "" diff --git a/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty b/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch index 24fe1c9bdb..24fe1c9bdb 100644 --- a/packages/zroadmap/files/qt2-fixes-r1.patch +++ b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch diff --git a/packages/zroadmap/files/qt2-fixes.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch index 46b17b8cfb..46b17b8cfb 100644 --- a/packages/zroadmap/files/qt2-fixes.patch +++ b/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch diff --git a/packages/roadmap/zroadmap.inc b/packages/roadmap/zroadmap.inc new file mode 100644 index 0000000000..acee708837 --- /dev/null +++ b/packages/roadmap/zroadmap.inc @@ -0,0 +1,13 @@ +require roadmap.inc + +SECTION = "opie/applications" + +inherit palmtop + +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' +QT_LIBRARY_append_c7x0 = " -laticore" + +do_configure() { + echo removing pregenerated stuff + find . -name "moc*"|xargs rm -f +} diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb new file mode 100644 index 0000000000..9a7b73d1a1 --- /dev/null +++ b/packages/roadmap/zroadmap_1.0.12.bb @@ -0,0 +1,33 @@ +require zroadmap.inc + +PR = "r1" + +SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ + file://qt2-fixes.patch;pnum=2;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://zroadgps.png" +S = "${WORKDIR}/roadmap-${PV}/src" + +EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ + GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \ + GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"' + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a + cd qt && oe_runmake +} + +do_install() { + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ + install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ + install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ +} diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb new file mode 100644 index 0000000000..42184ce62b --- /dev/null +++ b/packages/roadmap/zroadmap_1.1.0.bb @@ -0,0 +1,40 @@ +require zroadmap.inc + +DEPENDS += "expat" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ + file://cross.patch;patch=1;pnum=2 \ + file://qt/qt2-fixes.patch;patch=1 \ + file://qt/qt_canvas.patch;patch=1 \ + file://qt/qt_main.patch;patch=1 \ + file://qt/roadmap_main.patch;patch=1 \ + file://qt/roadmap.desktop.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ + file://zroadgps.png" +S = "${WORKDIR}/roadmap-${PV}/src" + +EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \ + CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a + oe_runmake -C gpx libgpx.a + oe_runmake -C unix libosroadmap.a + oe_runmake -C qt qtroadmap qtroadgps +} + +do_install() { + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ + install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ +} diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb new file mode 100644 index 0000000000..5b39faf071 --- /dev/null +++ b/packages/roadmap/zroadmap_cvs.bb @@ -0,0 +1,42 @@ +require zroadmap.inc + +DEPENDS += "expat" +SRCDATE = "20071212" +PV = "1.1.0+cvs-${SRCDATE}" +PR = "r0" + +SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ + file://cross.patch;patch=1;pnum=2 \ + file://qt/qt2-fixes.patch;patch=1 \ + file://qt/qt_canvas.patch;patch=1 \ +#upstream file://qt/qt_main.patch;patch=1 \ + file://qt/roadmap_main.patch;patch=1 \ +#upstream file://qt/roadmap.desktop.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ + file://zroadgps.png" +S = "${WORKDIR}/roadmap/src" + +EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ + CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a + oe_runmake -C gpx libgpx.a + oe_runmake -C unix libosroadmap.a + oe_runmake -C qt qtroadmap qtroadgps +} + +do_install() { + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ + install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ +} diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 33d93f2921..dc071f16ce 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -295,7 +295,7 @@ RRECOMMENDS_task-base-usbhost = "\ kernel-module-usb-storage " RDEPENDS_task-base-uboot = "\ - uboot-utils" + u-boot-utils-native" RDEPENDS_task-base-redboot = "\ fis" diff --git a/packages/tasks/task-devimage.bb b/packages/tasks/task-devimage.bb index bd0c15e70f..9da765ee94 100644 --- a/packages/tasks/task-devimage.bb +++ b/packages/tasks/task-devimage.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Image for development testing" -PR = "r1" +PR = "r2" LICENSE = "MIT" inherit task @@ -14,6 +14,7 @@ RDEPENDS = "\ module-init-tools pcmciautils \ wireless-tools wpa-supplicant \ irda-utils acx-firmware \ + kexec-tools \ ${DEVIMAGE_EXTRA_RDEPENDS} \ " diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb new file mode 100644 index 0000000000..a5d13e7e08 --- /dev/null +++ b/packages/tasks/task-openmoko-base.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +# +# task-openmoko-base +# +DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager" +RDEPENDS_task-openmoko-base = "\ + matchbox-panel-2 \ + matchbox-panel-2-applets \ + matchbox-keyboard-inputmethod \ + matchbox-keyboard-im \ + matchbox-keyboard-applet \ + matchbox-stroke \ + openmoko-terminal2 \ +# openmoko-keyboard \ + openmoko-panel-battery \ + openmoko-panel-bt \ + openmoko-panel-clock \ + openmoko-panel-usb \ + ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \ + \ + openmoko-today2 \ +# openmoko-appmanager \ +" diff --git a/packages/tasks/task-openmoko-examples.bb b/packages/tasks/task-openmoko-examples.bb new file mode 100644 index 0000000000..c5dbfb6f04 --- /dev/null +++ b/packages/tasks/task-openmoko-examples.bb @@ -0,0 +1,6 @@ +DESCRIPTION = "OpenMoko: Examples for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task
\ No newline at end of file diff --git a/packages/tasks/task-openmoko-games.bb b/packages/tasks/task-openmoko-games.bb new file mode 100644 index 0000000000..0fdf3cac33 --- /dev/null +++ b/packages/tasks/task-openmoko-games.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "OpenMoko: Games for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +# +# task-openmoko-games +# +DESCRIPTION_task-openmoko-games = "OpenMoko: Games" +RDEPENDS_task-openmoko-games = "\ + oh-puzzles \ +" diff --git a/packages/tasks/task-openmoko-linux.bb b/packages/tasks/task-openmoko-linux.bb new file mode 100644 index 0000000000..59e6f24094 --- /dev/null +++ b/packages/tasks/task-openmoko-linux.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "OpenMoko: Core system for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +# +# task-openmoko-core +# +DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services" +RDEPENDS_task-openmoko-linux = "\ + task-base \ + netbase \ + sysfsutils \ + modutils-initscripts \ + module-init-tools-depmod \ + rsync \ + screen \ + psplash \ + fbset \ + fbset-modes \ +# update-alternatives \ +" diff --git a/packages/tasks/task-openmoko-net.bb b/packages/tasks/task-openmoko-net.bb new file mode 100644 index 0000000000..e75dc4b4ff --- /dev/null +++ b/packages/tasks/task-openmoko-net.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "OpenMoko: Networking for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +# +# task-openmoko-net +# +DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking" +RDEPENDS_task-openmoko-net = "\ + bluez-utils \ + bridge-utils \ +" diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb new file mode 100644 index 0000000000..e47a1e5465 --- /dev/null +++ b/packages/tasks/task-openmoko-phone.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PROVIDES = "task-openmoko-everything" +PR = "r71" + +inherit task + +# +# task-openmoko-phone +# +DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services" +RDEPENDS_task-openmoko-phone = "\ + gsmd \ + libgsmd-tools \ + openmoko-dialer2 \ + openmoko-panel-gsm \ +# ppp \ +" diff --git a/packages/tasks/task-openmoko-pim.bb b/packages/tasks/task-openmoko-pim.bb new file mode 100644 index 0000000000..1eea1a14a1 --- /dev/null +++ b/packages/tasks/task-openmoko-pim.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "OpenMoko: PIM for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +# +# task-openmoko-pim +# +DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite" +RDEPENDS_task-openmoko-pim = "\ + eds-dbus \ + openmoko-calculator2 \ + openmoko-contacts2 \ + openmoko-dates2 \ + openmoko-feedreader2 \ + openmoko-browser2 \ + openmoko-appmanager2 \ + openmoko-tasks2 \ + openmoko-mediaplayer2 \ + openmoko-messages2 \ +" diff --git a/packages/tasks/task-openmoko-ui.bb b/packages/tasks/task-openmoko-ui.bb new file mode 100644 index 0000000000..e34bb42b2f --- /dev/null +++ b/packages/tasks/task-openmoko-ui.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "OpenMoko: GUI for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r71" + +inherit task + +XSERVER ?= "xserver-kdrive-fbdev" + +# +# task-openmoko-ui +# +DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface" +PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}" +RDEPENDS_task-openmoko-ui = "\ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-gif \ + gdk-pixbuf-loader-xpm \ + gdk-pixbuf-loader-jpeg \ + pango-module-basic-x \ + pango-module-basic-fc \ + gtk+ \ + matchbox-wm \ + ${XSERVER} \ + xserver-kdrive-common \ + xserver-nodm-init \ + xauth \ + xhost \ + xset \ + xrandr \ + \ + settings-daemon \ + notification-daemon \ + neod \ + libnotify \ + \ + openmoko-session2 \ + openmoko-sound-system2 \ + openmoko-sound-theme-standard2 \ + \ + gpe-scap \ +" + +# Handle theming. FIXME: properly use machine database in a smart way, +# taking into account not only size but also PPI! Ultimately this might +# need recomputing some theme files and images on-the-fly :/ SVG and logical +# theme description anyone? Or simply Edje to the rescue! :D +THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2" +THEMES_a780 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" +THEMES_e680 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" +THEMES_a1200 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" +THEMES_rokre2 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" +THEMES_rokre6 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" +THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" + +RDEPENDS_task-openmoko-ui += "${THEMES}" diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 76e0b843f7..730ea339aa 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -6,158 +6,26 @@ PR = "r71" inherit task -XSERVER ?= "xserver-kdrive-fbdev" +PACKAGES += "\ + task-openmoko-everything \ +" -PACKAGES = "\ +RDEPENDS_task-openmoko-everything := "\ task-openmoko-linux \ task-openmoko-ui \ task-openmoko-base \ task-openmoko-phone \ task-openmoko-pim \ task-openmoko-net \ - \ task-openmoko-games \ task-openmoko-examples \ -" - -RDEPENDS_task-openmoko-everything := "\ - ${PACKAGES} \ task-openmoko-debug \ task-openmoko-native-sdk \ " -# -# task-openmoko-core -# -DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services" -RDEPENDS_task-openmoko-linux = "\ - task-base \ - netbase \ - sysfsutils \ - modutils-initscripts \ - module-init-tools-depmod \ - rsync \ - screen \ - psplash \ - fbset \ - fbset-modes \ -# update-alternatives \ -" - -# -# task-openmoko-ui -# -DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface" -PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}" -RDEPENDS_task-openmoko-ui = "\ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-gif \ - gdk-pixbuf-loader-xpm \ - gdk-pixbuf-loader-jpeg \ - pango-module-basic-x \ - pango-module-basic-fc \ - gtk+ \ - matchbox-wm \ - ${XSERVER} \ - xserver-kdrive-common \ - xserver-nodm-init \ - xauth \ - xhost \ - xset \ - xrandr \ - \ - settings-daemon \ - notification-daemon \ - neod \ - libnotify \ - \ - openmoko-session2 \ - openmoko-sound-system2 \ - openmoko-sound-theme-standard2 \ - \ - gpe-scap \ -" -# Handle theming. FIXME: properly use machine database in a smart way, -# taking into account not only size but also PPI! Ultimately this might -# need recomputing some theme files and images on-the-fly :/ SVG and logical -# theme description anyone? Or simply Edje to the rescue! :D -THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2" -THEMES_a780 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -THEMES_e680 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -THEMES_a1200 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -THEMES_rokre2 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -THEMES_rokre6 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" -RDEPENDS_task-openmoko-ui += "${THEMES}" -PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}" -# -# task-openmoko-base -# -DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager" -RDEPENDS_task-openmoko-base = "\ - matchbox-panel-2 \ - matchbox-panel-2-applets \ - matchbox-keyboard-inputmethod \ - matchbox-keyboard-im \ - matchbox-keyboard-applet \ - matchbox-stroke \ - openmoko-terminal2 \ -# openmoko-keyboard \ - openmoko-panel-battery \ - openmoko-panel-bt \ - openmoko-panel-clock \ - openmoko-panel-usb \ - ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \ - \ - openmoko-today2 \ -# openmoko-appmanager \ -" -# -# task-openmoko-phone -# -DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services" -RDEPENDS_task-openmoko-phone = "\ - gsmd \ - libgsmd-tools \ - openmoko-dialer2 \ - openmoko-panel-gsm \ -# ppp \ -" -# -# task-openmoko-pim -# -DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite" -RDEPENDS_task-openmoko-pim = "\ - eds-dbus \ - openmoko-calculator2 \ - openmoko-contacts2 \ - openmoko-dates2 \ - openmoko-feedreader2 \ - openmoko-browser2 \ - openmoko-appmanager2 \ - openmoko-tasks2 \ - openmoko-mediaplayer2 \ - openmoko-messages2 \ -" -# -# task-openmoko-net -# -DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking" -RDEPENDS_task-openmoko-net = "\ - bluez-utils \ - bridge-utils \ -" - -# -# task-openmoko-games -# -DESCRIPTION_task-openmoko-games = "OpenMoko: Games" -RDEPENDS_task-openmoko-games = "\ - oh-puzzles \ -" diff --git a/packages/uboot/files/glamo-ram-init.patch b/packages/uboot/files/glamo-ram-init.patch deleted file mode 100644 index 4c12074347..0000000000 --- a/packages/uboot/files/glamo-ram-init.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/board/neo1973/common/lowlevel_init.S b/board/neo1973/common/lowlevel_init.S -index 582aa0e..92a9c7b 100644 ---- a/board/neo1973/common/lowlevel_init.S -+++ b/board/neo1973/common/lowlevel_init.S -@@ -67,11 +67,11 @@ - #define B0_PMC 0x0 /* normal */ - - /* BANK1CON */ --#define B1_Tacs 0x0 /* 0clk */ --#define B1_Tcos 0x1 /* 1clk */ --#define B1_Tacc 0x4 /* 4clk */ --#define B1_Tcoh 0x1 /* 1clk */ --#define B1_Tah 0x0 /* 0clk */ -+#define B1_Tacs 0x3 /* 4clk */ -+#define B1_Tcos 0x3 /* 4clk */ -+#define B1_Tacc 0x7 /* 14clk */ -+#define B1_Tcoh 0x3 /* 4clk */ -+#define B1_Tah 0x3 /* 4clk */ - #define B1_Tacp 0x0 - #define B1_PMC 0x0 - diff --git a/packages/uboot/u-boot-1.2.0/env-Makefile.patch b/packages/uboot/u-boot-1.2.0/env-Makefile.patch index ad3a6b39a3..f6e9cb39ae 100644 --- a/packages/uboot/u-boot-1.2.0/env-Makefile.patch +++ b/packages/uboot/u-boot-1.2.0/env-Makefile.patch @@ -1,24 +1,19 @@ ---- u-boot-1.1.2.orig/tools/env/Makefile 2003-06-27 14:32:48.000000000 -0700 -+++ u-boot-1.1.2/tools/env/Makefile 2006-11-08 12:33:43.000000000 -0800 -@@ -27,7 +27,7 @@ - all: fw_printenv +--- u-boot-1.2.0/tools/env/Makefile.orig 2007-12-12 12:52:51.508745236 -0800 ++++ u-boot-1.2.0/tools/env/Makefile 2007-12-12 12:54:09.997218038 -0800 +@@ -31,7 +31,7 @@ + all: $(obj)fw_printenv - fw_printenv: $(SOURCES) $(HEADERS) -- $(CROSS_COMPILE)gcc -Wall -DUSE_HOSTCC $(SOURCES) -o fw_printenv -+ $(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -idirafter ../../include -Wall -DUSE_HOSTCC $(SOURCES) -o fw_printenv + $(obj)fw_printenv: $(SRCS) $(HEADERS) +- $(CROSS_COMPILE)gcc $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv ++ $(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -idirafter ../../include -DUSE_HOSTCC $(SRCS) -o $(obj)fw_printenv clean: - rm -f fw_printenv crc32.c -@@ -37,9 +37,9 @@ + rm -f $(obj)fw_printenv $(obj)crc32.c +@@ -43,6 +43,6 @@ - ######################################################################### - --.depend: Makefile $(SOURCES) -- $(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -DUSE_HOSTCC $(SOURCES) > $@ -+#.depend: Makefile $(SOURCES) -+# $(CC) -M $(HOST_CFLAGS) $(TARGET_CPPFLAGS) -DUSE_HOSTCC $(SOURCES) > $@ + include $(TOPDIR)/rules.mk --sinclude .depend -+#sinclude .depend +-sinclude $(obj).depend ++#sinclude $(obj).depend ######################################################################### diff --git a/packages/uboot/uboot-utils_1.2.0.bb b/packages/uboot/u-boot-utils-native_1.2.0.bb index fe9b3aca26..02f9748ae3 100644 --- a/packages/uboot/uboot-utils_1.2.0.bb +++ b/packages/uboot/u-boot-utils-native_1.2.0.bb @@ -1,13 +1,16 @@ -DESCRIPTION = "U-boot bootloader OS env. access tools for PPC" +DESCRIPTION = "U-boot bootloader mkimage utility" SECTION = "bootloaders" PRIORITY = "optional" LICENSE = "GPL" -PR = "r6" +ALLOW_EMPTY = "1" +PR = "r1" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2" S = "${WORKDIR}/u-boot-${PV}" +inherit native + do_configure() { : } diff --git a/packages/uboot/u-boot-utils_1.2.0.bb b/packages/uboot/u-boot-utils_1.2.0.bb new file mode 100644 index 0000000000..e86fc60311 --- /dev/null +++ b/packages/uboot/u-boot-utils_1.2.0.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "U-boot bootloader OS env. access tools" +SECTION = "bootloaders" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS_openprotium = "mtd-utils" +PR = "r7" + +SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2" +SRC_URI_append_openprotium = " \ + file://fw_env.c.patch;patch=1 \ + file://tools-Makefile.patch;patch=1 \ + file://env-Makefile.patch;patch=1 \ + file://fw_env.config" + +S = "${WORKDIR}/u-boot-${PV}" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-${PV}" + +EXTRA_OEMAKE_openprotium = "CROSS_COMPILE=${TARGET_PREFIX}" + +do_configure() { + : +} + +do_compile () { + oe_runmake Sandpoint8240_config + oe_runmake tools +} + +do_install () { + : +} + +do_install_openprotium () { + install -d ${D}/sbin + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv +} + diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb index 36ec1e130e..2ce92ad4a9 100644 --- a/packages/uboot/uboot-openmoko_svn.bb +++ b/packages/uboot/uboot-openmoko_svn.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" PROVIDES = "virtual/bootloader" LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}" PV = "1.3.0${LOCALVERSION}" -PR = "r0" +PR = "r1" SRCREV_FORMAT = "patches" @@ -20,7 +20,6 @@ SRC_URI = "\ file://uboot-eabi-fix-HACK.patch \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ file://makefile-no-dirafter.patch;patch=1 \ - file://glamo-ram-init.patch;patch=1 \ " S = "${WORKDIR}/git" diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri index 0c47afe7fd..640fa34174 100644 --- a/packages/webkit/files/WebKit.pri +++ b/packages/webkit/files/WebKit.pri @@ -11,12 +11,47 @@ qt-port:DEFINES += BUILDING_QT__=1 qt-port:!building-libs { QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR LIBS += -lQtWebKit + DEPENDPATH += $$PWD/WebKit/qt/Api +} + +gtk-port:!building-libs { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + LIBS += -lWebKitGtk + DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport +} + +gtk-port { + CONFIG += link_pkgconfig + + DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1 + + # We use FreeType directly with Cairo + PKGCONFIG += cairo-ft + + directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0 + else: PKGCONFIG += cairo gtk+-2.0 + + # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb) + CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG) + + # We use the curl http backend on all platforms + PKGCONFIG += libcurl + + LIBS += -lWebKitGtk -ljpeg -lpng + + QMAKE_CXXFLAGS += $$system(icu-config --cppflags) + QMAKE_LIBS += $$system(icu-config --ldflags) + + # This set of warnings is borrowed from the Mac build + QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef + + # These flags are based on optimization experience from the Mac port: + # Helps code size significantly and speed a little + QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + + DEPENDPATH += $$PWD/JavaScriptCore/API + INCLUDEPATH += $$PWD } -gtk-port:CONFIG += link_pkgconfig -gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl -gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__ -gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng -gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) DEFINES += USE_SYSTEM_MALLOC CONFIG(release) { @@ -32,7 +67,7 @@ gtk-port:INCLUDEPATH += \ $$BASE_DIR/WebCore/platform/graphics/cairo \ $$BASE_DIR/WebCore/loader/gtk \ $$BASE_DIR/WebCore/page/gtk \ - $$BASE_DIR/WebKit/gtk/Api \ + $$BASE_DIR/WebKit/gtk/WebView \ $$BASE_DIR/WebKit/gtk/WebCoreSupport INCLUDEPATH += \ $$BASE_DIR/JavaScriptCore/ \ diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro index aab0209a93..027017bd8d 100644 --- a/packages/webkit/files/WebKit.pro +++ b/packages/webkit/files/WebKit.pro @@ -3,9 +3,15 @@ CONFIG += ordered !gtk-port:CONFIG += qt-port qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins SUBDIRS += \ - WebCore + WebCore \ + JavaScriptCore/kjs/testkjs.pro + +qt-port { + SUBDIRS += WebKit/qt/QtLauncher + + !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro +} -qt-port:SUBDIRS += \ - WebKit/qt/QtLauncher gtk-port:SUBDIRS += \ - WebKitTools/GtkLauncher + WebKitTools/GtkLauncher \ + WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 262c6820db..c726020d1a 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -1,5 +1,8 @@ DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+" +# If you activate HTML5 media support (ENABLE_VIDEO=1) you'll need: +# DEPENDS += " gstreamer gst-plugins-base gnome-vfs " + WEBKIT_PORT = "gtk-port" WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt" @@ -9,7 +12,7 @@ FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher" require webkit.inc -PR = "r3" +PR = "r4" do_install() { install -d ${D}${bindir} diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc index 2ff61091c3..81c2d91bf8 100644 --- a/packages/webkit/webkit.inc +++ b/packages/webkit/webkit.inc @@ -34,7 +34,13 @@ do_configure() { do_compile_prepend() { mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ cd ${S}/JavaScriptCore/pcre - ${BUILD_CC} dftables.c -o dftables -I. -I../wtf + if test -e dftables.c + then + ${BUILD_CC} dftables.c -o dftables -I. -I../wtf + elif test -e dftables.cpp + then + ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf + fi cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ cd ${S}/WebKitBuilds/Debug } diff --git a/packages/zroadmap/zroadmap_1.0.12.bb b/packages/zroadmap/zroadmap_1.0.12.bb deleted file mode 100644 index 5b9161cfce..0000000000 --- a/packages/zroadmap/zroadmap_1.0.12.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection. A rudimentary trip feature allows \ -RoadMap to display some basic navigation information (distance to the destination, \ -direction, speed, etc..). Voice messages are generated that duplicate some of the screen information." -SECTION = "opie/applications" -PRIORITY = "optional" -AUTHOR = "Pascal Martin <pascal.martin@iname.com>" -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ - file://qt2-fixes.patch;pnum=2;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ - file://zroadgps.png" -S = "${WORKDIR}/roadmap-${PV}/src" - -inherit palmtop - -QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' -QT_LIBRARY_append_c7x0 = " -laticore" - -EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ - GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \ - GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"' -PARALLEL_MAKE = "" - -do_configure() { - echo removing pregenerated stuff - find . -name "moc*"|xargs rm -f -} - -do_compile() { - oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a - cd qt && oe_runmake -} - -do_install() { - cd qt - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/pics - install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps - install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ -} diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb deleted file mode 100644 index fd9cc5e95f..0000000000 --- a/packages/zroadmap/zroadmap_cvs.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection." -SECTION = "opie/applications" -PRIORITY = "optional" -AUTHOR = "Pascal Martin <pascal.martin@iname.com>" -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -DEPENDS = "popt expat" -LICENSE = "GPL" -PV = "1.0.12+cvs-${SRCDATE}" -PR = "r0" - -SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ - file://qt2-fixes-r1.patch;pnum=1;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ - file://zroadgps.png" -S = "${WORKDIR}/roadmap/src" - -inherit palmtop - -QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' -QT_LIBRARY_append_c7x0 = " -laticore" - -EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ - CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ - LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' -PARALLEL_MAKE = "" - -do_configure() { - echo removing pregenerated stuff - find . -name "moc*"|xargs rm -f -} - -do_compile() { - oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a - oe_runmake -C gpx libgpx.a - oe_runmake -C unix libosroadmap.a - oe_runmake -C qt qtroadmap qtroadgps -} - -do_install() { - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/pics - install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps - install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ - install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ -} |
