[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-165-geaa875b
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-165-geaa875b
|
From: Julien B a. A. <ar...@us...> - 2010-12-14 08:45:54
|
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 eaa875b217a6d63e1947261a524d282a75ddca8c (commit)
via d80cb5e7dd42793606a90a495b244fd9b3a56038 (commit)
from 8ee94381d0788e9cb242c9f0dead9864bc0f5adc (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 eaa875b217a6d63e1947261a524d282a75ddca8c
Merge: d80cb5e7dd42793606a90a495b244fd9b3a56038 8ee94381d0788e9cb242c9f0dead9864bc0f5adc
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 14 09:45:13 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d80cb5e7dd42793606a90a495b244fd9b3a56038
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 14 09:44:26 2010 +0100
[BUILDROOT] [2010.11] Add support for latest 2010.11 BR release (thanks krem)
-----------------------------------------------------------------------
Summary of changes:
Makefile | 7 +---
.../2010.11/076-ubi-add_ubi_image_support.patch | 12 ++++----
...078-sdl-add_patch_for_paths_in_sdl_config.patch | 20 -------------
.../buildroot/2010.11/081-adds_quake_package.patch | 29 +++++++++++--------
.../buildroot/2010.11/107-games-add_wolf4sdl.patch | 12 ++++----
.../2010.11/125-opentyrian-add_package.patch | 14 +++++-----
...ffs2-add_board_name_to_binary_rootfs_name.patch | 16 +++++-----
7 files changed, 46 insertions(+), 64 deletions(-)
delete mode 100644 patches/buildroot/2010.11/078-sdl-add_patch_for_paths_in_sdl_config.patch
diff --git a/Makefile b/Makefile
index 7a0e099..bf52991 100644
--- a/Makefile
+++ b/Makefile
@@ -33,12 +33,9 @@ BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot
ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/target/device/armadeus
else
-#BUILDROOT_VERSION:=2010.11
-#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
-#BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
-BUILDROOT_VERSION:=2010.11-rc1
+BUILDROOT_VERSION:=2010.11
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
-BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2010.11
+BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
endif
#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
diff --git a/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch b/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
index b96ea72..c18d277 100644
--- a/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
+++ b/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
@@ -6,7 +6,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/fs/ubi/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/fs/ubi/Config.in 2010-11-01 19:43:55.000000000 +0100
++++ buildroot/fs/ubi/Config.in 2010-12-14 08:27:38.000000000 +0100
@@ -0,0 +1,22 @@
+config BR2_TARGET_ROOTFS_UBI
+ depends on BR2_TARGET_ROOTFS_UBIFS
@@ -33,7 +33,7 @@ Index: buildroot/fs/ubi/Config.in
Index: buildroot/fs/ubi/ubi.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/fs/ubi/ubi.mk 2010-11-09 14:56:46.000000000 +0100
++++ buildroot/fs/ubi/ubi.mk 2010-12-14 08:44:21.000000000 +0100
@@ -0,0 +1,24 @@
+#############################################################
+#
@@ -48,7 +48,7 @@ Index: buildroot/fs/ubi/ubi.mk
+endif
+
+
-+ROOTFS_UBI_DEPENDENCIES = ubifs-root
++ROOTFS_UBI_DEPENDENCIES = rootfs-ubifs
+
+define ROOTFS_UBI_CMD
+ cp fs/ubi/ubinize.cfg . ;\
@@ -62,7 +62,7 @@ Index: buildroot/fs/ubi/ubi.mk
Index: buildroot/fs/ubi/ubinize.cfg
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/fs/ubi/ubinize.cfg 2010-11-01 19:43:55.000000000 +0100
++++ buildroot/fs/ubi/ubinize.cfg 2010-12-14 08:27:38.000000000 +0100
@@ -0,0 +1,7 @@
+[ubifs]
+mode=ubi
@@ -73,8 +73,8 @@ Index: buildroot/fs/ubi/ubinize.cfg
+vol_flags=autoresize
Index: buildroot/fs/ubifs/Config.in
===================================================================
---- buildroot.orig/fs/ubifs/Config.in 2010-11-01 19:39:39.000000000 +0100
-+++ buildroot/fs/ubifs/Config.in 2010-11-01 19:43:55.000000000 +0100
+--- buildroot.orig/fs/ubifs/Config.in 2010-11-30 16:52:43.000000000 +0100
++++ buildroot/fs/ubifs/Config.in 2010-12-14 08:27:38.000000000 +0100
@@ -77,3 +77,5 @@
endchoice
diff --git a/patches/buildroot/2010.11/078-sdl-add_patch_for_paths_in_sdl_config.patch b/patches/buildroot/2010.11/078-sdl-add_patch_for_paths_in_sdl_config.patch
deleted file mode 100644
index 33f8b66..0000000
--- a/patches/buildroot/2010.11/078-sdl-add_patch_for_paths_in_sdl_config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch 2010-06-18 11:04:32.000000000 +0200
-@@ -0,0 +1,15 @@
-+--- SDL-1.2.11.org/sdl-config.in 2007-11-17 16:43:59.000000000 +0100
-++++ SDL-1.2.11/sdl-config.in 2007-11-17 16:45:31.000000000 +0100
-+@@ -41,10 +41,10 @@
-+ echo @SDL_VERSION@
-+ ;;
-+ --cflags)
-+- echo -I@includedir@/SDL @SDL_CFLAGS@
-++ echo -I$STAGING_DIR/include/SDL @SDL_CFLAGS@
-+ ;;
-+ @ENABLE_SHARED_TRUE@ --libs)
-+-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-++@ENABLE_SHARED_TRUE@ echo -L$STAGING_DIR/lib @SDL_RLD_FLAGS@ @SDL_LIBS@
-+ @ENABLE_SHARED_TRUE@ ;;
-+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
-+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
diff --git a/patches/buildroot/2010.11/081-adds_quake_package.patch b/patches/buildroot/2010.11/081-adds_quake_package.patch
index 8018478..c90bf77 100644
--- a/patches/buildroot/2010.11/081-adds_quake_package.patch
+++ b/patches/buildroot/2010.11/081-adds_quake_package.patch
@@ -16,8 +16,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/games/sdlquake/sdlquake.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake.mk 2010-06-23 14:11:31.000000000 +0200
-@@ -0,0 +1,31 @@
++++ buildroot/package/games/sdlquake/sdlquake.mk 2010-12-14 08:48:47.000000000 +0100
+@@ -0,0 +1,36 @@
+#############################################################
+#
+# Quake 1 (SDL_Port)
@@ -31,10 +31,15 @@ Index: buildroot/package/games/sdlquake/sdlquake.mk
+SDLQUAKE_INSTALL_STAGING = NO
+SDLQUAKE_INSTALL_TARGET = YES
+
-+SDLQUAKE_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
-+ --build=$(GNU_HOST_NAME) --prefix=/usr --sysconfdir=/etc
++SDLQUAKE_CONF_OPT = \
++ --target=$(GNU_TARGET_NAME) \
++ --host=$(GNU_TARGET_NAME) \
++ --build=$(GNU_HOST_NAME) \
++ --with-sdl-prefix=$(STAGING_DIR)/usr \
++ --prefix=/usr \
++ --sysconfdir=/etc
+
-+SDLQUAKE_DEPENDENCIES = uclibc sdl sdl_mixer SDL_net
++SDLQUAKE_DEPENDENCIES = sdl sdl_mixer SDL_net
+
+$(eval $(call AUTOTARGETS,package/games,sdlquake))
+
@@ -52,7 +57,7 @@ Index: buildroot/package/games/sdlquake/sdlquake.mk
Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2010-06-23 14:11:31.000000000 +0200
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2010-12-14 08:27:38.000000000 +0100
@@ -0,0 +1,35 @@
+--- /tmp/Makefile.am 2008-08-11 20:31:09.000000000 +0200
++++ sdlquake-1.0.9/Makefile.am 2008-08-11 20:55:00.263198000 +0200
@@ -92,7 +97,7 @@ Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
Index: buildroot/package/games/sdlquake/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/Config.in 2010-06-23 14:11:31.000000000 +0200
++++ buildroot/package/games/sdlquake/Config.in 2010-12-14 08:27:38.000000000 +0100
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SDLQUAKE
+ bool "sdlquake"
@@ -107,7 +112,7 @@ Index: buildroot/package/games/sdlquake/Config.in
Index: buildroot/package/games/quake-pak/quake-pak.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/quake-pak.mk 2010-06-23 14:11:31.000000000 +0200
++++ buildroot/package/games/quake-pak/quake-pak.mk 2010-12-14 08:27:38.000000000 +0100
@@ -0,0 +1,34 @@
+#############################################################
+#
@@ -146,7 +151,7 @@ Index: buildroot/package/games/quake-pak/quake-pak.mk
Index: buildroot/package/games/quake-pak/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/Config.in 2010-06-23 14:11:31.000000000 +0200
++++ buildroot/package/games/quake-pak/Config.in 2010-12-14 08:27:38.000000000 +0100
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_QUAKE_PAK
+ bool "shareware Quake PAK/WAD file"
@@ -157,9 +162,9 @@ Index: buildroot/package/games/quake-pak/Config.in
+ The file will be placed in the /usr/share/games/quake/ directory.
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:11:22.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:11:31.000000000 +0200
-@@ -82,8 +82,10 @@
+--- buildroot.orig/package/Config.in 2010-12-14 08:27:38.000000000 +0100
++++ buildroot/package/Config.in 2010-12-14 08:55:59.000000000 +0100
+@@ -83,8 +83,10 @@
source "package/games/gnuchess/Config.in"
source "package/games/magiccube4d/Config.in"
source "package/games/prboom/Config.in"
diff --git a/patches/buildroot/2010.11/107-games-add_wolf4sdl.patch b/patches/buildroot/2010.11/107-games-add_wolf4sdl.patch
index 7b9e6c3..d865b3a 100644
--- a/patches/buildroot/2010.11/107-games-add_wolf4sdl.patch
+++ b/patches/buildroot/2010.11/107-games-add_wolf4sdl.patch
@@ -5,7 +5,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/games/wolf4sdl/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/wolf4sdl/Config.in 2010-06-23 14:13:01.000000000 +0200
++++ buildroot/package/games/wolf4sdl/Config.in 2010-12-14 08:27:39.000000000 +0100
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_WOLF4SDL
+ bool "Wolf4SDL"
@@ -21,7 +21,7 @@ Index: buildroot/package/games/wolf4sdl/Config.in
Index: buildroot/package/games/wolf4sdl/wolf4sdl.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/wolf4sdl/wolf4sdl.mk 2010-06-23 14:13:01.000000000 +0200
++++ buildroot/package/games/wolf4sdl/wolf4sdl.mk 2010-12-14 08:46:25.000000000 +0100
@@ -0,0 +1,55 @@
+#############################################################
+#
@@ -51,7 +51,7 @@ Index: buildroot/package/games/wolf4sdl/wolf4sdl.mk
+ touch $@
+
+$(WOLF4SDL_DIR)/wolf3d: $(WOLF4SDL_DIR)/.unpacked
-+ $(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CXX) PREFIX=$(TARGET_DIR)/usr/local \
++ $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" PREFIX=$(TARGET_DIR)/usr/local \
+ SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config \
+ -C $(WOLF4SDL_DIR)
+
@@ -80,9 +80,9 @@ Index: buildroot/package/games/wolf4sdl/wolf4sdl.mk
+endif
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:12:57.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:13:01.000000000 +0200
-@@ -86,6 +86,7 @@
+--- buildroot.orig/package/Config.in 2010-12-14 08:27:39.000000000 +0100
++++ buildroot/package/Config.in 2010-12-14 08:55:49.000000000 +0100
+@@ -87,6 +87,7 @@
source "package/games/doom-wad/Config.in"
source "package/games/rubix/Config.in"
source "package/games/sdlquake/Config.in"
diff --git a/patches/buildroot/2010.11/125-opentyrian-add_package.patch b/patches/buildroot/2010.11/125-opentyrian-add_package.patch
index 632f007..55285f8 100644
--- a/patches/buildroot/2010.11/125-opentyrian-add_package.patch
+++ b/patches/buildroot/2010.11/125-opentyrian-add_package.patch
@@ -1,19 +1,19 @@
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-29 11:21:25.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-29 11:21:25.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-12-14 08:27:39.000000000 +0100
++++ buildroot/package/Config.in 2010-12-14 08:55:39.000000000 +0100
@@ -83,6 +83,7 @@
+ source "package/e-uae/Config.in"
source "package/games/gnuchess/Config.in"
- source "package/games/lxdoom/Config.in"
source "package/games/magiccube4d/Config.in"
+source "package/opentyrian/Config.in"
source "package/games/prboom/Config.in"
source "package/games/quake-pak/Config.in"
- source "package/games/rubix/Config.in"
+ source "package/games/doom-wad/Config.in"
Index: buildroot/package/opentyrian/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/opentyrian/Config.in 2010-06-29 11:21:25.000000000 +0200
++++ buildroot/package/opentyrian/Config.in 2010-12-14 08:27:39.000000000 +0100
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_OPENTYRIAN
+ bool "OpenTyrian"
@@ -29,7 +29,7 @@ Index: buildroot/package/opentyrian/Config.in
Index: buildroot/package/opentyrian/opentyrian.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/opentyrian/opentyrian.mk 2010-07-04 18:03:01.000000000 +0200
++++ buildroot/package/opentyrian/opentyrian.mk 2010-12-14 08:47:18.000000000 +0100
@@ -0,0 +1,50 @@
+#############################################################
+#
@@ -59,7 +59,7 @@ Index: buildroot/package/opentyrian/opentyrian.mk
+
+define OPENTYRIAN_BUILD_CMDS
+ $(MAKE) PLATFORM=UNIX \
-+ CC=$(TARGET_CC) \
++ CC="$(TARGET_CC)" \
+ STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" \
+ SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config \
+ -C $(OPENTYRIAN_DIR) \
diff --git a/patches/buildroot/2010.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch b/patches/buildroot/2010.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch
index 985a48b..82cc473 100644
--- a/patches/buildroot/2010.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch
+++ b/patches/buildroot/2010.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch
@@ -12,19 +12,19 @@ Index: buildroot/fs/common.mk
define ROOTFS_TARGET_INTERNAL
--$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
+-$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
- @$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
-+$(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.arm.$(1): $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
-+ @$(call MESSAGE,"Generating root filesystem image $(BR2_BOARD_NAME)-rootfs.arm.$(1)")
++$(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
++ @$(call MESSAGE,"Generating root filesystem image $(BR2_BOARD_NAME)-rootfs.$(1)")
$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
rm -f $(FAKEROOT_SCRIPT)
touch $(BUILD_DIR)/.fakeroot.00000
@@ -64,7 +64,7 @@
- $(1)-root-show-depends:
- @echo $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
+ rootfs-$(1)-show-depends:
+ @echo $(ROOTFS_$(2)_DEPENDENCIES)
--$(1)-root: $(BINARIES_DIR)/rootfs.$(1) $(ROOTFS_$(2)_POST_TARGETS)
-+$(1)-root: $(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.arm.$(1) $(ROOTFS_$(2)_POST_TARGETS)
+-rootfs-$(1): $(BINARIES_DIR)/rootfs.$(1) $(ROOTFS_$(2)_POST_TARGETS)
++rootfs-$(1): $(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.$(1) $(ROOTFS_$(2)_POST_TARGETS)
ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
- TARGETS += $(1)-root
+ TARGETS += rootfs-$(1)
hooks/post-receive
--
armadeus
|
