diff options
55 files changed, 1160 insertions, 75 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 9c1208c690..86f3eaa1fb 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -23,7 +23,7 @@ FEED_URIS += " \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" SRCDATE = "20060518" -#SRCDATE_handhelds-pxa-2.6 = "20060516" +SRCDATE_handhelds-pxa-2.6 = "20060622" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf new file mode 100644 index 0000000000..e1805c0d0f --- /dev/null +++ b/conf/distro/generic-unstable.conf @@ -0,0 +1,28 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Bleeding Edge +#@DESCRIPTION: An experimental distribution configuration +#@-------------------------------------------------------------------- + +require conf/distro/generic.conf + +# +# Binutils & Compiler +# +PREFERRED_VERSION_gcc = "4.1.1" +PREFERRED_VERSION_gcc-cross = "4.1.1" +PREFERRED_VERSION_gcc-cross-initial = "4.1.1" +PREFERRED_VERSION_binutils = "2.16.91.0.7" +PREFERRED_VERSION_binutils-cross = "2.16.91.0.7" +PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" + +# +# Target OS, FPU system and libc +# +TARGET_OS = "linux" +TARGET_FPU = "soft" +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_VERSION_glibc = "2.4" +PREFERRED_VERSION_glibc-intermediate = "2.4" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index f7da451e65..8a9d427c9f 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -68,9 +68,9 @@ TARGET_OS = "linux" #<>What we want on the bootstrap image (extra) #<> #<> -BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev kernel-modules \ +BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \ e2tools e2fsprogs" -BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev kernel-modules \ +BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \ e2tools e2fsprogs" #<> diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 800cd77540..288f3ebaa9 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -15,7 +15,7 @@ BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d) BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" -PXA270_MODULES = "g_ether snd_pcm_oss snd_mixer_oss hidp" +PXA270_MODULES = "g_ether g_serial snd_pcm_oss snd_mixer_oss hidp i2c-core i2c-pxa i2c-sensor" SERIAL_CONSOLE = "115200 tts/0" @@ -30,14 +30,16 @@ include conf/machine/include/tune-xscale.conf #include conf/machine/include/tune-iwmmxt.conf BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}" -UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds" +UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class" module_autoload_htcuniversal_power = "htcuniversal_power" module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_firmware-class = "firmware-class" module_autoload_acx = "acx" +module_autoload_htcuniversal-acx = "htcuniversal_acx" module_autoload_htcuniversal-bt = "htcuniversal_bt" module_autoload_htcuniversal-power = "htcuniversal_power" diff --git a/conf/machine/include/smartphone-common.conf b/conf/machine/include/smartphone-common.conf index 2ff8d4bc47..bd5983cdc0 100644 --- a/conf/machine/include/smartphone-common.conf +++ b/conf/machine/include/smartphone-common.conf @@ -3,6 +3,7 @@ ipsec \ nvrd \ mip6-mn \ tun \ +nls-base nls-cp437 nls-iso8859-1 \ fat vfat \ loop \ rfcomm bnep l2cap sco hci_uart hidp \ diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index f5cc893c9c..9ed313334b 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -22,7 +22,8 @@ MODUTILS = "26" PCMCIA_MANAGER = "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" +BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" +BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ @@ -41,8 +42,12 @@ include conf/machine/include/tune-xscale.conf #include conf/machine/include/tune-iwmmxt.conf BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" -HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ - hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" + +# These modules are now compiled into the kernel: +#HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \ +# hx4700_pcmcia hx4700_ts hx4700_power" + +HX4700_MODULES = "i2c-pxa hx4700_voltage hx4700_acx snd_hx4700_audio" module_autoload_evdev = "evdev" diff --git a/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch b/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch new file mode 100644 index 0000000000..a909513b1c --- /dev/null +++ b/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch @@ -0,0 +1,13 @@ +diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h +--- asterisk-1.2.0-old/include/asterisk/compat.h 2005-11-08 05:13:19.000000000 +0100 ++++ asterisk-1.2.0-new/include/asterisk/compat.h 2005-12-04 05:32:31.000000000 +0100 +@@ -75,7 +75,9 @@ + #define HAVE_STRTOQ + + #ifdef _BSD_SOURCE ++#ifndef __UCLIBC__ + #define HAVE_GETLOADAVG ++#endif /* __UCLIBC__ */ + #endif + + #ifdef __linux__ diff --git a/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch b/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch new file mode 100644 index 0000000000..23657bcc76 --- /dev/null +++ b/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch @@ -0,0 +1,18 @@ +diff -ruN asterisk-1.0.7-old/dns.c asterisk-1.0.7-new/dns.c +--- asterisk-1.0.7-old/dns.c 2004-06-22 22:11:15.000000000 +0200 ++++ asterisk-1.0.7-new/dns.c 2005-03-19 17:38:06.000000000 +0100 +@@ -153,7 +153,13 @@ + + #if defined(res_ninit) + #define HAS_RES_NINIT +-#else ++#endif ++ ++#ifdef __UCLIBC__ ++#undef HAS_RES_NINIT ++#endif ++ ++#ifndef HAS_RES_NINIT + AST_MUTEX_DEFINE_STATIC(res_lock); + #if 0 + #warning "Warning, res_ninit is missing... Could have reentrancy issues" diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb index b08e178388..46f24c0e35 100644 --- a/packages/asterisk/asterisk_1.2.9.1.bb +++ b/packages/asterisk/asterisk_1.2.9.1.bb @@ -2,9 +2,11 @@ DESCRIPTION="The Asterisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt" -PR = "r4" +PR = "r5" SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ + file://uclibc-compat-getloadavg.patch;patch=1 \ + file://uclibc-dsn.patch;patch=1 \ file://asterisk.patch;patch=1" diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty b/packages/dillo/dillo-0.8.6/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty +++ b/packages/dillo/dillo-0.8.6/.mtn2git_empty diff --git a/packages/dillo/dillo-0.8.6/dillo.desktop b/packages/dillo/dillo-0.8.6/dillo.desktop new file mode 100644 index 0000000000..6c5f994da4 --- /dev/null +++ b/packages/dillo/dillo-0.8.6/dillo.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Web browser +Comment=Dillo +Exec=dillo +Terminal=0 +Type=Application +Icon=dillo.png +Categories=Application;PIM;GPE +StartupNotify=True diff --git a/packages/dillo/dillo-0.8.6/dillo.png b/packages/dillo/dillo-0.8.6/dillo.png Binary files differnew file mode 100644 index 0000000000..99c942f190 --- /dev/null +++ b/packages/dillo/dillo-0.8.6/dillo.png diff --git a/packages/dillo/dillo-0.8.6/font.patch b/packages/dillo/dillo-0.8.6/font.patch new file mode 100644 index 0000000000..ace3da8dd6 --- /dev/null +++ b/packages/dillo/dillo-0.8.6/font.patch @@ -0,0 +1,15 @@ +--- dillo-0.8.5/src/dw_style.c.orig 2005-12-20 13:01:19.000000000 +0000 ++++ dillo-0.8.5/src/dw_style.c 2005-12-20 13:03:34.000000000 +0000 +@@ -330,6 +330,12 @@ + } + + if (font->font == NULL) { ++ /* Try another platform-font that should be available. (fam83) */ ++ font->font = ++ gdk_font_load ++ ("-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1"); ++ } ++ if (font->font == NULL) { + /* Can't load any suitable font! */ + g_warning ("Can't load any ISO8859-1 font!?! :("); + font->font = diff --git a/packages/dillo/dillo_0.8.6.bb b/packages/dillo/dillo_0.8.6.bb new file mode 100644 index 0000000000..be4a59b034 --- /dev/null +++ b/packages/dillo/dillo_0.8.6.bb @@ -0,0 +1,31 @@ +SECTION = "x11/network" +DESCRIPTION = "Lightweight gtk+ browser." +LICENSE = "GPL" +DEPENDS = "gtk+-1.2 libpng" +SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \ + file://font.patch;patch=1 \ + file://dillo.desktop \ + file://dillo.png" + + +MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" +PRIORITY = "optional" + +RCONFLICTS = "dillo2" + +S = "${WORKDIR}/dillo-${PV}/" + +inherit autotools pkgconfig + +FILES_${PN} += " /usr/lib/dillo/ /usr/bin/dpid /usr/bin/dpidc " + +export PNG_CONFIG = "${STAGING_BINDIR}/libpng-config" + +EXTRA_OECONF = "--disable-dlgui" + +do_install_append() { + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/dillo.desktop ${D}${datadir}/applications/dillo.desktop + install -m 0644 ${WORKDIR}/dillo.png ${D}${datadir}/pixmaps/dillo.png +} diff --git a/packages/links/links-x11_2.1pre22.bb b/packages/links/links-x11_2.1pre22.bb new file mode 100644 index 0000000000..f763df7f60 --- /dev/null +++ b/packages/links/links-x11_2.1pre22.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL" +SECTION = "console/network" +DEPENDS = "jpeg libpng flex openssl zlib libx11" +DESCRIPTION = "Links is graphics and text mode WWW \ +browser, similar to Lynx." +RCONFLICTS = "links" + +MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" + +SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ + file://ac-prog-cxx.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --without-fb \ + --without-directfb --without-pmshell --without-atheos \ + --with-x --without-gpm --without-sdl" + +S = "${WORKDIR}/links-${PV}" diff --git a/packages/links/links_2.1pre22.bb b/packages/links/links_2.1pre22.bb new file mode 100644 index 0000000000..e0a991e148 --- /dev/null +++ b/packages/links/links_2.1pre22.bb @@ -0,0 +1,19 @@ +LICENSE = "GPL" +SECTION = "console/network" +DEPENDS = "jpeg libpng gpm flex openssl zlib" +DESCRIPTION = "Links is graphics and text mode WWW \ +browser, similar to Lynx." +RCONFLICTS="links-x11" + +MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" + +SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ + file://ac-prog-cxx.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --with-fb \ + --without-directfb --without-pmshell --without-atheos \ + --without-x --without-sdl" diff --git a/packages/linux/linux-openzaurus_2.6.16+git.bb b/packages/linux/linux-openzaurus_2.6.16+git.bb index 9977b7e2a7..a268ea2dfa 100644 --- a/packages/linux/linux-openzaurus_2.6.16+git.bb +++ b/packages/linux/linux-openzaurus_2.6.16+git.bb @@ -16,21 +16,20 @@ DEFAULT_PREFERENCE = "-1" # Hacks should clearly named and at the bottom # ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;tag=553698f944ed715dfe023b4cef07601f0ce735f0 \ + ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \ + ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \ + ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1;status=merged \ + ${RPSRC}/zaurus_reboot-r3.patch;patch=1;status=merged \ + ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1;status=merged \ + ${RPSRC}/poodle_ssp-r1.patch;patch=1;status=merged \ + ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \ ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \ ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \ - ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \ - ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \ + ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=pending \ file://00-hostap.patch;patch=1;status=pending \ file://10-pcnet.patch;patch=1;status=pending \ - ${RPSRC}/zaurus_reboot-r3.patch;patch=1 \ - ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \ - ${RPSRC}/poodle_ssp-r1.patch;patch=1 \ - ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ - ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \ - ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ -# ${RPSRC}/alsa/asoc-v0.10rc8.patch;patch=1 \ +# ${RPSRC}/alsa/asoc-v0.10-oz-r0.patch;patch=1 \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ ${RPSRC}/asoc_fixups-r1.patch;patch=1 \ ${RPSRC}/hx2750_base-r25.patch;patch=1 \ @@ -49,12 +48,15 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi ${DOSRC}/kexec-arm-r2.patch;patch=1 \ ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \ ${RPSRC}/poodle_pm-r1.patch;patch=1 \ + ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ file://add-oz-release-string.patch;patch=1;status=unmergable \ + ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \ + ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \ ${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ file://pxa-serial-hack.patch;patch=1;status=hack \ @@ -78,15 +80,10 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi # http://tglx.de/projects/armirq/2.6.17-rc3/patch-2.6.17-rc3-armirq4.patch;patch=1 \ # ${RPSRC}/../pxa27x_overlay-r0.patch;patch=1 \ -# These patches would really help collie/poodle but we -# need someone to maintain them -# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 -# (Pavel Machek's git tree has updated versions of this?) -# Also parts were recently committed to mainline by rmk (drivers/mfd/) -# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 -# (This is mostly in mainline now?) -# ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ -# ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ +# Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/) +# (Pavel Machek's git tree has updated versions of this?) +# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 + SRC_URI_append_tosa = "\ ${CHSRC}/usb-ohci-hooks-r1.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index c35d1d8e75..08a64160c1 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -67,8 +67,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ file://00-hostap.patch;patch=1;status=pending \ file://10-pcnet.patch;patch=1;status=pending \ - ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \ - ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ ${RPSRC}/asoc_fixups-r0.patch;patch=1 \ ${RPSRC}/hx2750_base-r24.patch;patch=1 \ @@ -80,11 +78,11 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/input_power-r4.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ - ${RPSRC}/collie_frontlight-r1.patch;patch=1 \ - ${RPSRC}/zaurus_reboot-r0.patch;patch=1 \ + ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=pending \ + ${RPSRC}/zaurus_reboot-r0.patch;patch=1;status=merged \ ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \ ${RPSRC}/pm_changes-r1.patch;patch=1 \ - ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ + ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \ ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ ${DOSRC}/kexec-arm-r2.patch;patch=1 \ @@ -97,6 +95,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ file://add-oz-release-string.patch;patch=1;status=unmergable \ + ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \ + ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \ ${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ ${RPSRC}/poodle_ts_hack-r0.patch;patch=1;status=hack \ diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index dae8e49e68..cb3f0a6313 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" @@ -16,21 +16,20 @@ DEFAULT_PREFERENCE = "-1" # Hacks should clearly named and at the bottom # ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ + ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \ + ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \ + ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1;status=merged \ + ${RPSRC}/zaurus_reboot-r3.patch;patch=1;status=merged \ + ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1;status=merged \ + ${RPSRC}/poodle_ssp-r1.patch;patch=1;status=merged \ + ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \ ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \ ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \ - ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \ - ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \ + ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=pending \ file://00-hostap.patch;patch=1;status=pending \ file://10-pcnet.patch;patch=1;status=pending \ - ${RPSRC}/zaurus_reboot-r3.patch;patch=1 \ - ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \ - ${RPSRC}/poodle_ssp-r1.patch;patch=1 \ - ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ - ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \ - ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ -# ${RPSRC}/alsa/asoc-v0.10rc8.patch;patch=1 \ +# ${RPSRC}/alsa/asoc-v0.10-oz-r0.patch;patch=1 \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ ${RPSRC}/asoc_fixups-r1.patch;patch=1 \ ${RPSRC}/hx2750_base-r25.patch;patch=1 \ @@ -49,12 +48,15 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${DOSRC}/kexec-arm-r2.patch;patch=1 \ ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \ ${RPSRC}/poodle_pm-r1.patch;patch=1 \ + ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ file://add-oz-release-string.patch;patch=1;status=unmergable \ + ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \ |
