[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-557-g805805e
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-557-g805805e
|
From: Sébastien S. <ss...@us...> - 2015-01-19 13:17:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 805805ea1f7e79f08b40aabd89cc69db3b45ffe5 (commit)
via 8392c583286d4ee88b7e14aaa2b41a9adc88e139 (commit)
via 3c095210b45d84d0672be9cc81caf865181520e5 (commit)
from 8ac276be25cd2f5da8a4355718e8bbd66b52ae68 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 805805ea1f7e79f08b40aabd89cc69db3b45ffe5
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 19 14:18:14 2015 +0100
[SCRIPT] quiltify.sh: do not try to delete or remove target dir if it does
not exist.
commit 8392c583286d4ee88b7e14aaa2b41a9adc88e139
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 19 14:17:46 2015 +0100
[LINUX] 3.18: move to 3.18.3
commit 3c095210b45d84d0672be9cc81caf865181520e5
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 19 14:06:50 2015 +0100
[LINUX] 3.19: move to 3.19-rc5
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
buildroot/configs/apf6_defconfig | 2 +-
...nux-3.18.2.config => apf27-linux-3.18.3.config} | 0
...3.19-rc4.config => apf27-linux-3.19-rc5.config} | 0
...nux-3.18.2.config => apf28-linux-3.18.3.config} | 0
...3.19-rc4.config => apf28-linux-3.19-rc5.config} | 0
...nux-3.18.2.config => apf51-linux-3.18.3.config} | 0
...3.19-rc4.config => apf51-linux-3.19-rc5.config} | 0
...inux-3.18.2.config => apf6-linux-3.18.3.config} | 0
...-3.19-rc4.config => apf6-linux-3.19-rc5.config} | 0
patches/linux/{3.18.2 => 3.18.3} | 0
patches/linux/{3.19-rc4 => 3.19-rc5} | 0
scripts/quiltify.sh | 2 +-
15 files changed, 8 insertions(+), 8 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.18.2.config => apf27-linux-3.18.3.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.19-rc4.config => apf27-linux-3.19-rc5.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.18.2.config => apf28-linux-3.18.3.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.19-rc4.config => apf28-linux-3.19-rc5.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.18.2.config => apf51-linux-3.18.3.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.19-rc4.config => apf51-linux-3.19-rc5.config} (100%)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.18.2.config => apf6-linux-3.18.3.config} (100%)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.19-rc4.config => apf6-linux-3.19-rc5.config} (100%)
rename patches/linux/{3.18.2 => 3.18.3} (100%)
rename patches/linux/{3.19-rc4 => 3.19-rc5} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 5e8e340..2dd879a 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.2"
+BR2_DEFAULT_KERNEL_VERSION="3.18.3"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +34,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.3"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index d8b54fd..9fb8586 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.2"
+BR2_DEFAULT_KERNEL_VERSION="3.18.3"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +35,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.3"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index e600d7d..844d547 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.2"
+BR2_DEFAULT_KERNEL_VERSION="3.18.3"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +97,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.3"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index d7712dd..7eb4867 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -23,7 +23,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19-rc4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19-rc5"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.18.2.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.18.3.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc4.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc5.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.18.2.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.18.3.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc4.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc4.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc5.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.18.2.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.18.3.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc4.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc5.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.2.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.18.2.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.18.3.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc4.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc4.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc5.config
diff --git a/patches/linux/3.18.2 b/patches/linux/3.18.3
similarity index 100%
rename from patches/linux/3.18.2
rename to patches/linux/3.18.3
diff --git a/patches/linux/3.19-rc4 b/patches/linux/3.19-rc5
similarity index 100%
rename from patches/linux/3.19-rc4
rename to patches/linux/3.19-rc5
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 92528b6..aab7b69 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -143,7 +143,7 @@ if [ "$answer" == "y" ] || [ "$answer" == "yes" ]; then
fi
# Move or delete current XXX dir
-if [ "$QUILT_TARGET_NAME" != "Buildroot" ]; then
+if [ "$QUILT_TARGET_NAME" != "Buildroot" ] && [ -e "$QUILT_TARGET_DIR" ]; then
ask_user "Rename or delete the current $QUILT_TARGET_NAME directory: $QUILT_TARGET_DIR \n?? (R/d)"
EXT=`date +%Y_%m_%d_%Hh%M`
if [ "$answer" == "d" ]; then
hooks/post-receive
--
armadeus
|