[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-390-gec3418f
Brought to you by:
sszy
|
From: jorasse <jo...@us...> - 2013-08-16 13:37:13
|
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 ec3418fa8454db33c8e7cedc7924f9e2a0e31914 (commit)
from c5b7a6a92303ee3adb5bf29b2143905b82b32bf3 (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 ec3418fa8454db33c8e7cedc7924f9e2a0e31914
Author: Eric Jarrige <eri...@ar...>
Date: Fri Aug 16 15:47:02 2013 +0200
[BUILDROOT] remove most of the armadeus patch concerning linux - customization managed by dedidacted hook rules.
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2013.05/040-linux-makefile.patch | 47 --------------------
...x_in_a_standalone_way_after_configuration.patch | 13 -----
...-linux-change_board_specific_patches_name.patch | 13 -----
.../135-linux-add_linux26-clean_target.patch | 11 -----
4 files changed, 0 insertions(+), 84 deletions(-)
delete mode 100644 patches/buildroot/2013.05/040-linux-makefile.patch
delete mode 100644 patches/buildroot/2013.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
delete mode 100644 patches/buildroot/2013.05/071-linux-change_board_specific_patches_name.patch
delete mode 100644 patches/buildroot/2013.05/135-linux-add_linux26-clean_target.patch
diff --git a/patches/buildroot/2013.05/040-linux-makefile.patch b/patches/buildroot/2013.05/040-linux-makefile.patch
deleted file mode 100644
index e771b8d..0000000
--- a/patches/buildroot/2013.05/040-linux-makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: buildroot/linux/linux.mk
-===================================================================
---- buildroot.orig/linux/linux.mk 2012-02-12 23:22:29.000000000 +0100
-+++ buildroot/linux/linux.mk 2012-02-21 20:57:38.000000000 +0100
-@@ -50,7 +50,8 @@
-
- # Get the real Linux version, which tells us where kernel modules are
- # going to be installed in the target filesystem.
--LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
-+LINUX_VERSION_PROBED = $(LINUX_VERSION)
-+#LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
-
- ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y)
- KERNEL_DTS_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
-@@ -165,7 +166,14 @@
- KERNEL_SOURCE_CONFIG = $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
- endif
-
-+ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
-+define ARMADEUS_LINUX_CONFIG_HACKS
-+ ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(@D)/drivers/armadeus
-+endef
-+endif
-+
- define LINUX_CONFIGURE_CMDS
-+ $(ARMADEUS_LINUX_CONFIG_HACKS)
- cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
- $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
- rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
-@@ -265,7 +263,7 @@
-
-
- define LINUX_INSTALL_IMAGES_CMDS
-- cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
-+ cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)/$(ARMADEUS_LINUX_IMAGE_NAME)
- endef
-
- define LINUX_INSTALL_TARGET_CMDS
-@@ -315,7 +323,7 @@
- # Build the kernel.
- $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
- # Copy the kernel image to its final destination
-- cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
-+ cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)/$(ARMADEUS_LINUX_IMAGE_NAME)
- # If there is a .ub file copy it to the final destination
- test ! -f $(LINUX_IMAGE_PATH).ub || cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR)
- $(Q)touch $@
diff --git a/patches/buildroot/2013.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch b/patches/buildroot/2013.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
deleted file mode 100644
index 99779cd..0000000
--- a/patches/buildroot/2013.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: buildroot/linux/linux.mk
-===================================================================
---- buildroot.orig/linux/linux.mk 2012-02-21 20:57:58.000000000 +0100
-+++ buildroot/linux/linux.mk 2012-02-21 20:59:44.000000000 +0100
-@@ -168,6 +168,8 @@
-
- ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
- define ARMADEUS_LINUX_CONFIG_HACKS
-+ $(SED) "s,^ARCH.*,ARCH=$(KERNEL_ARCH),g;" $(@D)/Makefile
-+ $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(@D)/Makefile
- ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(@D)/drivers/armadeus
- endef
- endif
diff --git a/patches/buildroot/2013.05/071-linux-change_board_specific_patches_name.patch b/patches/buildroot/2013.05/071-linux-change_board_specific_patches_name.patch
deleted file mode 100644
index 7eddb94..0000000
--- a/patches/buildroot/2013.05/071-linux-change_board_specific_patches_name.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: buildroot/linux/linux.mk
-===================================================================
---- buildroot.orig/linux/linux.mk 2012-02-21 16:44:32.000000000 +0100
-+++ buildroot/linux/linux.mk 2012-02-21 16:44:34.000000000 +0100
-@@ -150,7 +150,7 @@
- if echo $$p | grep -q -E "^ftp://|^http://" ; then \
- support/scripts/apply-patches.sh $(@D) $(DL_DIR) `basename $$p` ; \
- elif test -d $$p ; then \
-- support/scripts/apply-patches.sh $(@D) $$p linux-\*.patch ; \
-+ support/scripts/apply-patches.sh $(@D) $$p \*.patch ; \
- else \
- support/scripts/apply-patches.sh $(@D) `dirname $$p` `basename $$p` ; \
- fi \
diff --git a/patches/buildroot/2013.05/135-linux-add_linux26-clean_target.patch b/patches/buildroot/2013.05/135-linux-add_linux26-clean_target.patch
deleted file mode 100644
index bda4b36..0000000
--- a/patches/buildroot/2013.05/135-linux-add_linux26-clean_target.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: buildroot/linux/linux.mk
-===================================================================
---- buildroot.orig/linux/linux.mk 2012-02-21 16:44:34.000000000 +0100
-+++ buildroot/linux/linux.mk 2012-02-21 16:45:55.000000000 +0100
-@@ -356,3 +356,6 @@
- endif
-
- endif
-+
-+linux26-clean:
-+ $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) clean
hooks/post-receive
--
armadeus
|