[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-36-gf501162
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-36-gf501162
|
From: Julien B a. A. <ar...@us...> - 2009-12-10 09:34:39
|
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 f501162576d91f4af422a10edbc6315501d96259 (commit)
via db425aceb62be6f9fdba9cbc1e5b35bdfbf8dbc8 (commit)
via ab8a6eb71019496638411f8ab49c45963f87876f (commit)
via c9cd2ad8d6c1f8aea73eb3e923dc6e03cbe74849 (commit)
via 81d31bbc8374213f3cc2b4b44798106dbed7408e (commit)
via 5801b8a3d4502a249ec67564bc10b650ccf86766 (commit)
via 433a74f1021f1a86e6c2f7a51924f3d51ae6937f (commit)
via 608417142dc23ab48694f92a9eca424701c5ae57 (commit)
from 23b7e0a290b47f92332f62db66ec982ea24ebe27 (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 f501162576d91f4af422a10edbc6315501d96259
Author: Julien Boibessot <jul...@ar...>
Date: Thu Dec 10 10:33:31 2009 +0100
[TOOLS] quiltify.sh: Check VCS used before launching correspondig status command
commit db425aceb62be6f9fdba9cbc1e5b35bdfbf8dbc8
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 22:42:55 2009 +0100
[BUILDROOT] Fixes snes9x package build
commit ab8a6eb71019496638411f8ab49c45963f87876f
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 10:10:16 2009 +0100
[BUILDROOT] Fix 070-add_ad9889ctl_package.patch due to recent moves of packages to armadeus/
commit c9cd2ad8d6c1f8aea73eb3e923dc6e03cbe74849
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 09:51:38 2009 +0100
[BUILDROOT] Move as_devices to newly created package/armadeus/
commit 81d31bbc8374213f3cc2b4b44798106dbed7408e
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 09:44:48 2009 +0100
[BUILDROOT] Move imxssi to newly created package/armadeus/
commit 5801b8a3d4502a249ec67564bc10b650ccf86766
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 09:38:20 2009 +0100
[BUILDROOT] Rename armadeus-tests.mk
commit 433a74f1021f1a86e6c2f7a51924f3d51ae6937f
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 09:36:55 2009 +0100
[BUILDROOT] Move Drivers Helpers to newly created package/armadeus/
commit 608417142dc23ab48694f92a9eca424701c5ae57
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 9 09:30:26 2009 +0100
[BUILDROOT] Move TestSuite to newly created package/armadeus/
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 3 +++
.../package/{ => armadeus}/as_devices/Config.in | 0
.../{ => armadeus}/as_devices/as_devices.mk | 0
.../drivers-helpers}/drivers-helpers.mk | 0
buildroot/package/{ => armadeus}/imxssi/Config.in | 0
buildroot/package/{ => armadeus}/imxssi/imxssi.mk | 0
.../testsuite}/Config.in | 0
.../testsuite/testsuite.mk} | 0
...s9x-compile.patch => snes9x-1.39-compile.patch} | 20 ++++++++++++++++++++
buildroot/package/snes9x/snes9x.mk | 15 ++++++---------
.../059-add_armadeus_testsuite_package.patch | 10 ----------
patches/buildroot/070-add_ad9889ctl_package.patch | 2 +-
scripts/quiltify.sh | 8 +++++++-
13 files changed, 37 insertions(+), 21 deletions(-)
rename buildroot/package/{ => armadeus}/as_devices/Config.in (100%)
rename buildroot/package/{ => armadeus}/as_devices/as_devices.mk (100%)
rename buildroot/package/{armadeus-drivers-helpers => armadeus/drivers-helpers}/drivers-helpers.mk (100%)
rename buildroot/package/{ => armadeus}/imxssi/Config.in (100%)
rename buildroot/package/{ => armadeus}/imxssi/imxssi.mk (100%)
rename buildroot/package/{armadeus-testsuite => armadeus/testsuite}/Config.in (100%)
rename buildroot/package/{armadeus-testsuite/armadeus-tests.mk => armadeus/testsuite/testsuite.mk} (100%)
rename buildroot/package/snes9x/{snes9x-compile.patch => snes9x-1.39-compile.patch} (94%)
delete mode 100644 patches/buildroot/059-add_armadeus_testsuite_package.patch
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index ebd0c28..5a277c0 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -1,5 +1,8 @@
menu "Armadeus specific tools/utilities"
+source package/armadeus/as_devices/Config.in
source package/armadeus/demos/Config.in
+source package/armadeus/imxssi/Config.in
+source package/armadeus/testsuite/Config.in
endmenu
diff --git a/buildroot/package/as_devices/Config.in b/buildroot/package/armadeus/as_devices/Config.in
similarity index 100%
rename from buildroot/package/as_devices/Config.in
rename to buildroot/package/armadeus/as_devices/Config.in
diff --git a/buildroot/package/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
similarity index 100%
rename from buildroot/package/as_devices/as_devices.mk
rename to buildroot/package/armadeus/as_devices/as_devices.mk
diff --git a/buildroot/package/armadeus-drivers-helpers/drivers-helpers.mk b/buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk
similarity index 100%
rename from buildroot/package/armadeus-drivers-helpers/drivers-helpers.mk
rename to buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk
diff --git a/buildroot/package/imxssi/Config.in b/buildroot/package/armadeus/imxssi/Config.in
similarity index 100%
rename from buildroot/package/imxssi/Config.in
rename to buildroot/package/armadeus/imxssi/Config.in
diff --git a/buildroot/package/imxssi/imxssi.mk b/buildroot/package/armadeus/imxssi/imxssi.mk
similarity index 100%
rename from buildroot/package/imxssi/imxssi.mk
rename to buildroot/package/armadeus/imxssi/imxssi.mk
diff --git a/buildroot/package/armadeus-testsuite/Config.in b/buildroot/package/armadeus/testsuite/Config.in
similarity index 100%
rename from buildroot/package/armadeus-testsuite/Config.in
rename to buildroot/package/armadeus/testsuite/Config.in
diff --git a/buildroot/package/armadeus-testsuite/armadeus-tests.mk b/buildroot/package/armadeus/testsuite/testsuite.mk
similarity index 100%
rename from buildroot/package/armadeus-testsuite/armadeus-tests.mk
rename to buildroot/package/armadeus/testsuite/testsuite.mk
diff --git a/buildroot/package/snes9x/snes9x-compile.patch b/buildroot/package/snes9x/snes9x-1.39-compile.patch
similarity index 94%
rename from buildroot/package/snes9x/snes9x-compile.patch
rename to buildroot/package/snes9x/snes9x-1.39-compile.patch
index b41a30f..aa8dcd1 100644
--- a/buildroot/package/snes9x/snes9x-compile.patch
+++ b/buildroot/package/snes9x/snes9x-1.39-compile.patch
@@ -273,3 +273,23 @@
}
return (SUCCESS);
+--- snes9x-sdl-1.39/globals.cpp 2003-10-27 09:42:22.000000000 +0100
++++ snes9x-sdl-1.39.mod/globals.cpp 2009-12-09 10:33:53.000000000 +0100
+@@ -54,6 +54,8 @@
+ #include "sa1.h"
+ //#include "netplay.h"
+
++struct SDSP1 DSP1;
++
+ START_EXTERN_C
+ char String[513];
+
+@@ -73,8 +75,6 @@
+
+ struct SSettings Settings;
+
+-struct SDSP1 DSP1;
+-
+ struct SRegisters SA1Registers;
+ //struct SSA1Registers SA1Registers;
+
diff --git a/buildroot/package/snes9x/snes9x.mk b/buildroot/package/snes9x/snes9x.mk
index b3a6f84..5a1703d 100644
--- a/buildroot/package/snes9x/snes9x.mk
+++ b/buildroot/package/snes9x/snes9x.mk
@@ -9,6 +9,7 @@ SNES9X_SITE:=http://www.vanille.de/mirror/
# roms: http://rtgamer.free.fr/index.php?pg=2&rub=sn
SNES9X_CAT:=bzcat
SNES9X_DIR:=$(BUILD_DIR)/snes9x-sdl-$(SNES9X_VERSION)
+SNES9X_TARGET_BIN:=/usr/local/bin/snes9x
#SNES9X_VERSION:=1.43
#SNES9X_SOURCE:=snes9x-$(SNES9X_VERSION)-src.tar.gz
@@ -51,20 +52,16 @@ $(SNES9X_DIR)/.configured: $(SNES9X_DIR)/.patched
$(SNES9X_DIR)/snes9x: $(SNES9X_DIR)/.configured
# $(MAKE) -C $(SNES9X_DIR)/snes9x
$(MAKE) -C $(SNES9X_DIR) \
- CC="$(STAGING_DIR)/bin/arm-linux-gcc" CCC="$(STAGING_DIR)/bin/arm-linux-c++ -fno-rtti -fno-exceptions" \
+ CC=$(TARGET_CC) CCC="$(TARGET_CXX) -fno-rtti -fno-exceptions" \
INCLUDES="-I$(STAGING_DIR)/usr/lib/include `$(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
LDLIBS="`$(STAGING_DIR)/usr/bin/sdl-config --libs`"
touch $@
-# $(STAGING_DIR)/usr/lib/libSDL.so: $(SNES9X_DIR)/.compiled
-# $(MAKE) -C $(SNES9X_DIR) install
-# touch -c $(STAGING_DIR)/usr/lib/libSDL.so
-#
-# $(TARGET_DIR)/usr/lib/libSDL.so: $(STAGING_DIR)/usr/lib/libSDL.so
-# cp -dpf $(STAGING_DIR)/usr/lib/libSDL*.so* $(TARGET_DIR)/usr/lib/
-# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libSDL.so
+$(TARGET_DIR)/$(SNES9X_TARGET_BIN): $(SNES9X_DIR)/snes9x
+ cp -f $(SNES9X_DIR)/snes9x $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
-SNES9X snes9x: sdl $(SNES9X_DIR)/snes9x
+SNES9X snes9x: sdl $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
snes9x-clean:
# $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SNES9X_DIR) uninstall
diff --git a/patches/buildroot/059-add_armadeus_testsuite_package.patch b/patches/buildroot/059-add_armadeus_testsuite_package.patch
deleted file mode 100644
index 392428c..0000000
--- a/patches/buildroot/059-add_armadeus_testsuite_package.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- buildroot/package/Config.in.org 2008-12-11 18:37:45.000000000 +0100
-+++ buildroot/package/Config.in 2008-12-11 18:38:28.000000000 +0100
-@@ -242,6 +242,7 @@
-
- if BR2_BLOCKDEV_SUPPORT
- source "package/acpid/Config.in"
-+source "package/armadeus-testsuite/Config.in"
- source "package/ch7024ctrl/Config.in"
- source "package/dbus/Config.in"
- source "package/dbus-glib/Config.in"
diff --git a/patches/buildroot/070-add_ad9889ctl_package.patch b/patches/buildroot/070-add_ad9889ctl_package.patch
index a016b4d..85e7c8c 100644
--- a/patches/buildroot/070-add_ad9889ctl_package.patch
+++ b/patches/buildroot/070-add_ad9889ctl_package.patch
@@ -1,9 +1,9 @@
--- buildroot/package/Config.in.ori 2009-01-14 18:27:51.000000000 +0100
+++ buildroot/package/Config.in 2009-01-13 11:16:07.000000000 +0100
@@ -243,6 +243,7 @@
+
if BR2_BLOCKDEV_SUPPORT
source "package/acpid/Config.in"
- source "package/armadeus-testsuite/Config.in"
+source "package/ad9889ctrl/Config.in"
source "package/ch7024ctrl/Config.in"
source "package/dbus/Config.in"
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 6048c3a..058a672 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -52,7 +52,13 @@ if [ "$1" == "export" ]; then
echo "Exporting your work (patches) from $QUILT_TARGET_DIR/patches/ to $QUILT_TARGET_PATCH_DIR"
cp -f $QUILT_TARGET_DIR/patches/*.patch $QUILT_TARGET_PATCH_DIR
echo -e "\n--- You can now check your work before commiting --> \n"
- git status
+ if [ -d ".git" ]; then
+ git status
+ elif [ -d ".svn" ]; then
+ svn status -q
+ else
+ echo "No VCS found"
+ fi
exit 0
fi
hooks/post-receive
--
armadeus
|
