diff options
author | Stanislav Brabec <utx@penguin.cz> | 2009-04-07 21:17:33 +0000 |
---|---|---|
committer | utx@penguin.cz <utx@penguin.cz> | 2009-04-07 21:17:33 +0000 |
commit | 67949fd39594befc0158bfe99fa3c075e63807a2 (patch) | |
tree | 8317c247112d4b25a2e5f9afd87aa956b5db3ae7 | |
parent | 949728423681eda38e5e34b84cd3281bba71fdf7 (diff) | |
parent | 2fe33f3c7f0bff141187fc0c9005cc779c5f9458 (diff) |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r-- | conf/checksums.ini | 56 | ||||
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/omap3.inc | 3 | ||||
-rw-r--r-- | recipes/e17/e-wm_svn.bb | 3 | ||||
-rw-r--r-- | recipes/gnome/gnome-bluetooth_2.27.1.bb | 14 | ||||
-rw-r--r-- | recipes/gnome/libunique_1.0.8.bb | 7 | ||||
-rw-r--r-- | recipes/kexecboot/initramfs-kexecboot-image.bb | 2 | ||||
-rw-r--r-- | recipes/linux/linux-omap-2.6.28/modedb-hd720.patch | 13 | ||||
-rw-r--r-- | recipes/linux/linux-omap-2.6.29/beagleboard/defconfig | 11 | ||||
-rw-r--r-- | recipes/linux/linux-omap-2.6.29/modedb-hd720.patch | 13 | ||||
-rw-r--r-- | recipes/linux/linux-omap_2.6.28.bb | 1 | ||||
-rw-r--r-- | recipes/linux/linux-omap_2.6.29.bb | 1 |
12 files changed, 119 insertions, 7 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 48edc83a62..e8647141ff 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -6934,14 +6934,26 @@ sha256=37b3286c2bfb68da9df983f60721f868e29897f7a426306748fee93b25c5fb61 md5=88785071f29ed0e0b6b61057a1079442 sha256=1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606 +[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2] +md5=88785071f29ed0e0b6b61057a1079442 +sha256=1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2] md5=ad9f97a4d04982ccf4fd67cb464879f3 sha256=985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7 +[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2] +md5=ad9f97a4d04982ccf4fd67cb464879f3 +sha256=985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2] md5=a4a3eb15c96030906d8494959eeda23c sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2] +md5=a4a3eb15c96030906d8494959eeda23c +sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc + [http://ftp.nluug.nl/languages/gcc/snapshots/4.2-20060513/gcc-4.2-20060513.tar.bz2] md5=ac6d19831220c4aeef4475492725486f sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e @@ -6950,30 +6962,58 @@ sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e md5=cba410e6ff70f7d7f4be7a0267707fd0 sha256=ca0a12695b3bccfa8628509e08cb9ed7d8ed48deff0a299e4cb8de87d2c1fced +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.1/gcc-4.2.1.tar.bz2] +md5=cba410e6ff70f7d7f4be7a0267707fd0 +sha256=ca0a12695b3bccfa8628509e08cb9ed7d8ed48deff0a299e4cb8de87d2c1fced + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2] md5=7ae33781417a35a2eb03ee098a9f4490 sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2] +md5=7ae33781417a35a2eb03ee098a9f4490 +sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2] md5=ef2a4d9991b3644115456ea05b2b8163 sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2] +md5=ef2a4d9991b3644115456ea05b2b8163 +sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2] md5=d79f553e7916ea21c556329eacfeaa16 sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2] +md5=d79f553e7916ea21c556329eacfeaa16 +sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2] md5=4afa0290cc3a41ac8822666f1110de98 sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2] +md5=4afa0290cc3a41ac8822666f1110de98 +sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] md5=5dfac5da961ecd5f227c3175859a486d sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] +md5=5dfac5da961ecd5f227c3175859a486d +sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2] md5=cc3c5565fdb9ab87a05ddb106ba0bd1f sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2] +md5=cc3c5565fdb9ab87a05ddb106ba0bd1f +sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de + [http://gcc.releasenotes.org/releases/gcc-4.3.3/gcc-4.3.3.tar.bz2] md5=cc3c5565fdb9ab87a05ddb106ba0bd1f sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de @@ -7814,6 +7854,10 @@ sha256=cea63cddf79864d306198c7a84091af0b4685816b352ae253a3e2bfac5e67cb7 md5=7f2a8cee97e62ebfa284363dc93b3178 sha256=9605f7aee1b8d58cac10dd514c2bdfa340089d85b149db828816d18ac3ebaff8 +[http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/2.27/gnome-bluetooth-2.27.1.tar.bz2] +md5=4a7c977086af47fe43ea08b29ab93503 +sha256=939c8a8f819b8c39e4e355a764b2a47c6959d57029c5134a51a282d7cccd60c5 + [http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.18/gnome-common-2.18.0.tar.bz2] md5=567172e685fc0783b1d6ab9843a85d6a sha256=ba28c1017e7e4212db16ada3f44cb446b6637c9c4fe16c0e2c2a51c94c46bc5b @@ -14150,6 +14194,10 @@ sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36 md5=8c198831cc0495596c78134b8849e9ad sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36 +[http://ftp.gnome.org/pub/GNOME/sources/libunique/1.0/libunique-1.0.8.tar.bz2] +md5=02b9e41c70ca738e1aa914f400fc1f05 +sha256=d627a10f523af14e9ead655ebab3a26e7faeea006bdfa7739bc4c04058ddf4c6 + [http://downloads.sourceforge.net/upnp/libupnp-1.3.1.tar.gz] md5=6646be5e31e58188e8f47c6ce64faa4c sha256=4d0d6a5302222757fb36ee21d8f8e1b3de849c2de658ab1105272f32ff78767d @@ -18662,6 +18710,10 @@ sha256=ac7e7d311b07abd27b084041bcc943398df303bc86601f281891537bdf1a4e0b md5=b05e1d7f0cac9cc4e096aa21409dee55 sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3 +[ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/source/v8.1.8/postgresql-8.1.8.tar.bz2] +md5=b05e1d7f0cac9cc4e096aa21409dee55 +sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3 + [ftp://ftp-archives.postgresql.org/pub/source/v8.2.4/postgresql-8.2.4.tar.bz2] md5=af7ec100a33c41bfb8d87b5e0ec2f44a sha256=8ff6afab743e894c0d96e668dcf9b3d3c1044719d6def45ef7390c64b54ed268 @@ -21170,6 +21222,10 @@ sha256=7eedc4ece1c82668c06222ef85457206139253e24a50e5b5d2401a41baee28c1 md5=860fe417ea5e9ca2d2b2225192b85b87 sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a +[http://www.dest-unreach.org/socat/download/socat-1.3.2.1.tar.bz2] +md5=860fe417ea5e9ca2d2b2225192b85b87 +sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a + [http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch] md5=fe6945121eaea5e9c570e3dad54d7569 sha256=578db455270592833156358f79205b21701aa12b64142da16df08fb36fca3322 diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index cf66f0028b..1f7a5fdf5b 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -256,7 +256,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "39786" +EFL_SRCREV ?= "39886" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index a0ec5fdda4..7159187391 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,6 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" -MACHINE_KERNEL_PR = "r22" +# Increase this everytime you change something in the kernel +MACHINE_KERNEL_PR = "r24" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index e82cf6904e..c9694fce80 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" PV = "0.16.999.050+svnr${SRCREV}" -PR = "r3" +PR = "r4" inherit e update-alternatives @@ -108,6 +108,7 @@ FILES_${PN} = "\ ${bindir}/* \ ${libdir}/enlightenment/modules/*/*.* \ ${libdir}/enlightenment/modules/*/*/* \ + ${libdir}/enlightenment/preload/e_precache.so \ ${datadir}/locale \ ${datadir}/enlightenment/data/icons \ ${datadir}/enlightenment/data/input_methods \ diff --git a/recipes/gnome/gnome-bluetooth_2.27.1.bb b/recipes/gnome/gnome-bluetooth_2.27.1.bb new file mode 100644 index 0000000000..9a435c7f9c --- /dev/null +++ b/recipes/gnome/gnome-bluetooth_2.27.1.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" + +PR = "r1" + +inherit autotools gnome pkgconfig + +DEPENDS = "gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" +RCONFLICTS_${PN} = "bluez-gnome" + +do_configure_prepend() { + sed -i -e s:docs::g ${S}/Makefile.am +} + diff --git a/recipes/gnome/libunique_1.0.8.bb b/recipes/gnome/libunique_1.0.8.bb new file mode 100644 index 0000000000..1526930177 --- /dev/null +++ b/recipes/gnome/libunique_1.0.8.bb @@ -0,0 +1,7 @@ +LICENSE = "LGPL" +SECTION = "x11/gnome" + +inherit autotools_stage gnome lib_package + +DEPENDS = "gtk+ dbus" + diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb index 385bd258ea..0284f691a7 100644 --- a/recipes/kexecboot/initramfs-kexecboot-image.bb +++ b/recipes/kexecboot/initramfs-kexecboot-image.bb @@ -10,6 +10,8 @@ IMAGE_DEVICE_TABLES_h2200 = "device_table-oldmmc.txt" export IMAGE_BASENAME = "initramfs-kexecboot-image" +KEXECBOOT_IMAGEDEPENDS ?= "" + # avoid to depend from kexecboot EXTRA_IMAGEDEPENDS = "${KEXECBOOT_IMAGEDEPENDS}" IMAGE_INSTALL = "kexecboot" diff --git a/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch b/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch new file mode 100644 index 0000000000..0166de651a --- /dev/null +++ b/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch @@ -0,0 +1,13 @@ +--- orig/drivers/video/modedb.c.orig 2009-04-07 11:40:10.000000000 +0200 ++++ git/drivers/video/modedb.c 2009-04-07 10:35:29.000000000 +0200 +@@ -44,6 +44,10 @@ + NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, + 0, FB_VMODE_NONINTERLACED + }, { ++ /* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-E Format 4 */ ++ "hd720", 60, 1280, 720, 13468, 220, 110, 20, 5, 40, 5, ++ 0, FB_VMODE_NONINTERLACED ++ }, { + /* 800x600 @ 56 Hz, 35.15 kHz hsync */ + NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2, + 0, FB_VMODE_NONINTERLACED diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig index fcbe27c803..ef5e35c99f 100644 --- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-omap1 -# Mon Apr 6 15:31:26 2009 +# Tue Apr 7 18:11:42 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -456,12 +456,15 @@ CONFIG_BT_HIDP=y # # Bluetooth device drivers # -# CONFIG_BT_HCIBTUSB is not set +CONFIG_BT_HCIBTUSB=y CONFIG_BT_HCIBTSDIO=y -# CONFIG_BT_HCIUART is not set +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIBCM203X=y CONFIG_BT_HCIBPA10X=y -# CONFIG_BT_HCIBFUSB is not set +CONFIG_BT_HCIBFUSB=y # CONFIG_BT_HCIBRF6150 is not set # CONFIG_BT_HCIH4P is not set # CONFIG_BT_HCIVHCI is not set diff --git a/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch b/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch new file mode 100644 index 0000000000..0166de651a --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch @@ -0,0 +1,13 @@ +--- orig/drivers/video/modedb.c.orig 2009-04-07 11:40:10.000000000 +0200 ++++ git/drivers/video/modedb.c 2009-04-07 10:35:29.000000000 +0200 +@@ -44,6 +44,10 @@ + NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, + 0, FB_VMODE_NONINTERLACED + }, { ++ /* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-E Format 4 */ ++ "hd720", 60, 1280, 720, 13468, 220, 110, 20, 5, 40, 5, ++ 0, FB_VMODE_NONINTERLACED ++ }, { + /* 800x600 @ 56 Hz, 35.15 kHz hsync */ + NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2, + 0, FB_VMODE_NONINTERLACED diff --git a/recipes/linux/linux-omap_2.6.28.bb b/recipes/linux/linux-omap_2.6.28.bb index 92de11eb9b..fe586e0f12 100644 --- a/recipes/linux/linux-omap_2.6.28.bb +++ b/recipes/linux/linux-omap_2.6.28.bb @@ -53,6 +53,7 @@ SRC_URI_append = " \ file://ioremap-fix.patch;patch=1 \ file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \ file://mmctiming.patch;patch=1 \ + file://modedb-hd720.patch;patch=1 \ " diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index bb7f2a416b..0948e46060 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -101,6 +101,7 @@ SRC_URI_append = " \ # file://isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch;patch=1 \ # file://isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch;patch=1 \ file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \ + file://modedb-hd720.patch;patch=1 \ " |