Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'hotfix-2011.05-mg00.1'

  • Loading branch information...
commit 71fb93964e1aae1fc2f772daa72f682aed64a09b 2 parents ffda0ff + 5e33558
@MaxGalemin authored
View
2  Makefile
@@ -24,7 +24,7 @@
#--------------------------------------------------------------
# Set and export the version string
-export BR2_VERSION:=2011.05-mg00
+export BR2_VERSION:=2011.05-mg00.1
# This top-level Makefile can *not* be executed in parallel
.NOTPARALLEL:
View
2  board/beagleboard/xm/linux-2.6.39.1.config
@@ -304,7 +304,7 @@ CONFIG_CRC7=y
CONFIG_LIBCRC32C=y
# CONFIG_ALIGNMENT_TRAP is not set
CONFIG_CROSS_COMPILE="arm-none-linux-gnueabi-"
-CONFIG_LOCALVERSION="-mg00"
+CONFIG_LOCALVERSION="-mg00.1"
CONFIG_OMAP_SMARTREFLEX=y
CONFIG_OMAP_SMARTREFLEX_CLASS3=y
CONFIG_DEVTMPFS=y
View
7 configs/beagle_xm_defconfig
@@ -1,20 +1,23 @@
BR2_arm=y
BR2_cortex_a8=y
+BR2_WGET="wget --passive-ftp -nd -t 3 --no-check-certificate"
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD is not set
BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/CodeSourcery"
# BR2_SOFT_FLOAT is not set
BR2_TARGET_OPTIMIZATION="-pipe -mfpu=neon -ftree-vectorize -mfloat-abi=softfp"
BR2_TARGET_GENERIC_GETTY_PORT="ttyO2"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_BASH=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="omap3_beagle"
-BR2_TARGET_UBOOT_EXTRAVERSION="-mg00"
+BR2_TARGET_UBOOT_EXTRAVERSION="-mg00.1"
BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_TARGET_UBOOT_DEFAULT_UENV=y
BR2_TARGET_XLOADER=y
BR2_TARGET_XLOADER_BOARDNAME="omap3beagle"
-BR2_TARGET_XLOADER_EXTRAVERSION="-mg00"
+BR2_TARGET_XLOADER_EXTRAVERSION="-mg00.1"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_PATCH="board/beagleboard/xm/kernel-patches/"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
View
5 configs/beagle_xm_full_defconfig
@@ -1,5 +1,6 @@
BR2_arm=y
BR2_cortex_a8=y
+BR2_WGET="wget --passive-ftp -nd -t 3 --no-check-certificate"
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD is not set
BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/CodeSourcery"
@@ -51,13 +52,13 @@ BR2_PACKAGE_MODULE_INIT_TOOLS=y
BR2_PACKAGE_NANO=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="omap3_beagle"
-BR2_TARGET_UBOOT_EXTRAVERSION="-mg00"
+BR2_TARGET_UBOOT_EXTRAVERSION="-mg00.1"
BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_TARGET_UBOOT_DEFAULT_UENV=y
BR2_TARGET_XLOADER=y
BR2_TARGET_XLOADER_BOARDNAME="omap3beagle"
-BR2_TARGET_XLOADER_EXTRAVERSION="-mg00"
+BR2_TARGET_XLOADER_EXTRAVERSION="-mg00.1"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_PATCH="board/beagleboard/xm/kernel-patches/"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
View
2  package/pixman/pixman.mk
@@ -3,7 +3,7 @@
# pixman
#
################################################################################
-PIXMAN_VERSION = 0.17.6
+PIXMAN_VERSION = 0.18.0
PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
PIXMAN_SITE = http://cairographics.org/releases/
PIXMAN_AUTORECONF = NO
Please sign in to comment.
Something went wrong with that request. Please try again.