diff options
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/eglibc/eglibc_2.10.bb | 2 | ||||
-rw-r--r-- | recipes/eglibc/eglibc_2.9.bb | 2 | ||||
-rw-r--r-- | recipes/eglibc/eglibc_svn.bb | 2 | ||||
-rw-r--r-- | recipes/eglibc/files/armv4t-interworking.patch | 27 | ||||
-rw-r--r-- | recipes/gnome/gnome-themes_2.22.2.bb | 31 | ||||
-rw-r--r-- | recipes/gnome/gnome-themes_2.24.0.bb | 31 | ||||
-rw-r--r-- | recipes/gnome/gnome-themes_2.6.2.bb | 31 | ||||
-rw-r--r-- | recipes/opencv/opencv-samples_svn.bb | 4 | ||||
-rw-r--r-- | recipes/opencv/opencv_svn.bb | 4 | ||||
-rw-r--r-- | recipes/u-boot/files/beagleboard/fw_env.config | 2 | ||||
-rw-r--r-- | recipes/u-boot/u-boot-utils_1.2.0.bb | 2 | ||||
-rw-r--r-- | recipes/u-boot/u-boot_git.bb | 2 |
12 files changed, 36 insertions, 104 deletions
diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb index d143b0ad0c..2a62fe3828 100644 --- a/recipes/eglibc/eglibc_2.10.bb +++ b/recipes/eglibc/eglibc_2.10.bb @@ -3,7 +3,7 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.10" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" SVN_REV="9124" EGLIBC_BRANCH="eglibc-2_10" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_10;rev=${SVN_REV};proto=svn \ diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb index 3efcb36d37..7a8262783e 100644 --- a/recipes/eglibc/eglibc_2.9.bb +++ b/recipes/eglibc/eglibc_2.9.bb @@ -3,7 +3,7 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.9" -PR = "${INC_PR}.5" +PR = "${INC_PR}.6" SVN_REV="8690" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index 1a91af88d8..3376839040 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -5,7 +5,7 @@ SRCREV = "9170" DEFAULT_PREFERENCE = "-1" FILESPATHPKG =. "eglibc-svn:" PV = "2.10+svnr${SRCREV}" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ diff --git a/recipes/eglibc/files/armv4t-interworking.patch b/recipes/eglibc/files/armv4t-interworking.patch index 55ee8565d7..6ab306180c 100644 --- a/recipes/eglibc/files/armv4t-interworking.patch +++ b/recipes/eglibc/files/armv4t-interworking.patch @@ -40,7 +40,7 @@ Index: libc/ports/sysdeps/unix/sysv/linux/arm/clone.S #endif @ pick the function arg and call address off the stack and execute ldr r0, [sp, #4] -+#if defined(__ARM_ARCH_V4T__) && defined(__THUMB_INTERWORK__) ++#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__) + ldr ip, [sp], #8 + mov lr, pc + bx ip @@ -51,3 +51,28 @@ Index: libc/ports/sysdeps/unix/sysv/linux/arm/clone.S @ and we are done, passing the return value through r0 b PLTJMP(HIDDEN_JUMPTARGET(_exit)) +Index: libc/ports/sysdeps/unix/sysv/linux/arm/sysdep.h +=================================================================== +--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/sysdep.h 2009-09-16 13:58:18.000000000 +0100 ++++ libc/ports/sysdeps/unix/sysv/linux/arm/sysdep.h 2009-11-03 19:17:16.000000000 +0000 +@@ -129,6 +129,11 @@ + DO_RET(lr); \ + 1: .word C_SYMBOL_NAME(rtld_errno) - 0b - 8; + # else ++#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__) ++#define POP_PC ldr lr, [sp], #4; bx lr ++#else ++#define POP_PC ldr pc, [sp], #4 ++#endif + # define SYSCALL_ERROR_HANDLER \ + __local_syscall_error: \ + str lr, [sp, #-4]!; \ +@@ -138,7 +143,7 @@ + rsb r1, r1, #0; \ + str r1, [r0]; \ + mvn r0, #0; \ +- ldr pc, [sp], #4; ++ POP_PC; + # endif + #else + # define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */ diff --git a/recipes/gnome/gnome-themes_2.22.2.bb b/recipes/gnome/gnome-themes_2.22.2.bb deleted file mode 100644 index 1b45ab4d05..0000000000 --- a/recipes/gnome/gnome-themes_2.22.2.bb +++ /dev/null @@ -1,31 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -DEPENDS = "gtk-engines icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "gnome-icon-theme" - -EXTRA_OECONF = "--enable-all-themes --disable-hicolor-check" - -inherit gnome - -PACKAGE_ARCH = "all" - -PACKAGES =+ " gtk-engine-crux gtk-engine-hc gtk-engine-lighthouseblue gtk-engine-mist gtk-engine-thinice" -FILES_gtk-engine-crux = "${libdir}/gtk-2.0/*/engines/libcrux-engine.so" -FILES_gtk-engine-hc = "${libdir}/gtk-2.0/*/engines/libhcengine.so" -FILES_gtk-engine-lighthouseblue = "${libdir}/gtk-2.0/*/engines/liblighthouseblue.so" -FILES_gtk-engine-mist = "${libdir}/gtk-2.0/*/engines/libmist.so" -FILES_gtk-engine-thinice = "${libdir}/gtk-2.0/*/engines/libthinice.so" - -PACKAGES =+ " gnome-theme-crux gnome-theme-grand-canyon gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-lighthouseblue gnome-theme-mist gnome-theme-traditional" -FILES_gnome-theme-crux = "${datadir}/themes/Crux ${datadir}/icons/Crux" -FILES_gnome-theme-grand-canyon = "${datadir}/themes/Grand-Canyon ${datadir}/icons/Grand-Canyon" -FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast ${datadir}/icons/HighContrast" -FILES_gnome-theme-highcontrastinverse = "${datadir}/themes/HighContrastInverse ${datadir}/icons/HighContrastInverse" -FILES_gnome-theme-highcontrastlargeprint = "${datadir}/themes/HighContrastLargePrint ${datadir}/icons/HighContrastLargePrint" -FILES_gnome-theme-highcontrastlargeprintinverse = "${datadir}/themes/HighContrastLargePrintInverse ${datadir}/icons/HighContrastLargePrintInverse" -FILES_gnome-theme-largeprint = "${datadir}/themes/LargePrint ${datadir}/icons/LargePrint" -FILES_gnome-theme-lighthouseblue = "${datadir}/themes/LighthouseBlue ${datadir}/icons/LighthouseBlue" -FILES_gnome-theme-mist = "${datadir}/themes/Mist ${datadir}/icons/Mist" -FILES_gnome-theme-traditional = "${datadir}/themes/Traditional ${datadir}/icons/Traditional" - -FILES_${PN} += "${datadir}/themes ${datadir}/icons" diff --git a/recipes/gnome/gnome-themes_2.24.0.bb b/recipes/gnome/gnome-themes_2.24.0.bb deleted file mode 100644 index 1b45ab4d05..0000000000 --- a/recipes/gnome/gnome-themes_2.24.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -DEPENDS = "gtk-engines icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "gnome-icon-theme" - -EXTRA_OECONF = "--enable-all-themes --disable-hicolor-check" - -inherit gnome - -PACKAGE_ARCH = "all" - -PACKAGES =+ " gtk-engine-crux gtk-engine-hc gtk-engine-lighthouseblue gtk-engine-mist gtk-engine-thinice" -FILES_gtk-engine-crux = "${libdir}/gtk-2.0/*/engines/libcrux-engine.so" -FILES_gtk-engine-hc = "${libdir}/gtk-2.0/*/engines/libhcengine.so" -FILES_gtk-engine-lighthouseblue = "${libdir}/gtk-2.0/*/engines/liblighthouseblue.so" -FILES_gtk-engine-mist = "${libdir}/gtk-2.0/*/engines/libmist.so" -FILES_gtk-engine-thinice = "${libdir}/gtk-2.0/*/engines/libthinice.so" - -PACKAGES =+ " gnome-theme-crux gnome-theme-grand-canyon gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-lighthouseblue gnome-theme-mist gnome-theme-traditional" -FILES_gnome-theme-crux = "${datadir}/themes/Crux ${datadir}/icons/Crux" -FILES_gnome-theme-grand-canyon = "${datadir}/themes/Grand-Canyon ${datadir}/icons/Grand-Canyon" -FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast ${datadir}/icons/HighContrast" -FILES_gnome-theme-highcontrastinverse = "${datadir}/themes/HighContrastInverse ${datadir}/icons/HighContrastInverse" -FILES_gnome-theme-highcontrastlargeprint = "${datadir}/themes/HighContrastLargePrint ${datadir}/icons/HighContrastLargePrint" -FILES_gnome-theme-highcontrastlargeprintinverse = "${datadir}/themes/HighContrastLargePrintInverse ${datadir}/icons/HighContrastLargePrintInverse" -FILES_gnome-theme-largeprint = "${datadir}/themes/LargePrint ${datadir}/icons/LargePrint" -FILES_gnome-theme-lighthouseblue = "${datadir}/themes/LighthouseBlue ${datadir}/icons/LighthouseBlue" -FILES_gnome-theme-mist = "${datadir}/themes/Mist ${datadir}/icons/Mist" -FILES_gnome-theme-traditional = "${datadir}/themes/Traditional ${datadir}/icons/Traditional" - -FILES_${PN} += "${datadir}/themes ${datadir}/icons" diff --git a/recipes/gnome/gnome-themes_2.6.2.bb b/recipes/gnome/gnome-themes_2.6.2.bb deleted file mode 100644 index 2c18b59654..0000000000 --- a/recipes/gnome/gnome-themes_2.6.2.bb +++ /dev/null @@ -1,31 +0,0 @@ -SECTION = "x11/base" -LICENSE = "LGPL" -DESCRIPTION = "GNOME themes" - -DEPENDS = "gtk-engines intltool-native" - -PACKAGES += " gtk-engine-crux gtk-engine-hc gtk-engine-lighthouseblue gtk-engine-mist gtk-engine-thinice" -FILES_gtk-engine-crux = "${libdir}/gtk-2.0/*/engines/libcrux-engine.so" -FILES_gtk-engine-hc = "${libdir}/gtk-2.0/*/engines/libhcengine.so" -FILES_gtk-engine-lighthouseblue = "${libdir}/gtk-2.0/*/engines/liblighthouseblue.so" -FILES_gtk-engine-mist = "${libdir}/gtk-2.0/*/engines/libmist.so" -FILES_gtk-engine-thinice = "${libdir}/gtk-2.0/*/engines/libthinice.so" - -PACKAGES += " gnome-theme-crux gnome-theme-grand-canyon gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-lighthouseblue gnome-theme-mist gnome-theme-traditional" -FILES_gnome-theme-crux = "${datadir}/themes/Crux" -FILES_gnome-theme-grand-canyon = "${datadir}/themes/Grand-Canyon" -FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast" -FILES_gnome-theme-highcontrastinverse = "${datadir}/themes/HighContrastInverse" -FILES_gnome-theme-highcontrastlargeprint = "${datadir}/themes/HighContrastLargePrint" -FILES_gnome-theme-highcontrastlargeprintinverse = "${datadir}/themes/HighContrastLargePrintInverse" -FILES_gnome-theme-largeprint = "${datadir}/themes/LargePrint" -FILES_gnome-theme-lighthouseblue = "${datadir}/themes/LighthouseBlue" -FILES_gnome-theme-mist = "${datadir}/themes/Mist" -FILES_gnome-theme-traditional = "${datadir}/themes/Traditional" - -SRC_URI = "${GNOME_MIRROR}/${PN}/2.6/${PN}-${PV}.tar.bz2" - -# gcc-3.4 blows up in gtktext with -frename-registers on arm-linux -CFLAGS := "${@'${CFLAGS}'.replace('-frename-registers', '')}" - -inherit autotools diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb index 547e668491..2a56d0652c 100644 --- a/recipes/opencv/opencv-samples_svn.bb +++ b/recipes/opencv/opencv-samples_svn.bb @@ -9,8 +9,8 @@ DEPENDS = "opencv" SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \ " -SRCREV = "2196" -PV = "1.0.0+1.1pre1+svnr${SRCREV}" +SRCREV = "2219" +PV = "2.0.0+svnr${SRCREV}" S = "${WORKDIR}/opencv" diff --git a/recipes/opencv/opencv_svn.bb b/recipes/opencv/opencv_svn.bb index ab14c58e43..3ed10bc3b1 100644 --- a/recipes/opencv/opencv_svn.bb +++ b/recipes/opencv/opencv_svn.bb @@ -11,8 +11,8 @@ DEPENDS = "ffmpeg gtk+ libtool swig swig-native python jpeg zlib libpng tiff gli SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \ file://acinclude.m4" -SRCREV = "2196" -PV = "1.0.0+1.1pre1+svnr${SRCREV}" +SRCREV = "2219" +PV = "2.0.0+svnr${SRCREV}" S = "${WORKDIR}/opencv" diff --git a/recipes/u-boot/files/beagleboard/fw_env.config b/recipes/u-boot/files/beagleboard/fw_env.config index 8fc96f7572..d9112c2256 100644 --- a/recipes/u-boot/files/beagleboard/fw_env.config +++ b/recipes/u-boot/files/beagleboard/fw_env.config @@ -4,5 +4,5 @@ # Notice, that the "Number of sectors" is ignored on NOR. # MTD device name Device offset Env. size Flash sector size Number of sectors -/dev/mtd2 0x0000 0x20000 0x40000 +/dev/mtd2 0x0000 0x20000 0x20000 diff --git a/recipes/u-boot/u-boot-utils_1.2.0.bb b/recipes/u-boot/u-boot-utils_1.2.0.bb index 076547eb84..f38ecbe572 100644 --- a/recipes/u-boot/u-boot-utils_1.2.0.bb +++ b/recipes/u-boot/u-boot-utils_1.2.0.bb @@ -3,7 +3,7 @@ SECTION = "bootloaders" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "mtd-utils" -PR = "r8" +PR = "r9" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ file://fw_env.c.patch;patch=1 \ diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 59c0598f97..39d6864a4d 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r33" +PR ="r34" FILESPATHPKG =. "u-boot-git:" |