[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-57-gbbdb624
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-57-gbbdb624
|
From: jorasse <jo...@us...> - 2009-09-14 23:02:20
|
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 bbdb624916d6c964be5b88b3d1d133fbe2800df5 (commit)
via 5379de657aee310b0eeb6a6ff3cf352ab16917fe (commit)
via e13405e7b5148fa0648f0115f8bd6379b1861dec (commit)
via bae7d22ac99d7960c75f705719f07aefc74c90a9 (commit)
via 330444c4570f731144d30764da93711c7f9f3a35 (commit)
from ee9e1d997a5e63de9979bfb10b1fef79a8ed8435 (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 bbdb624916d6c964be5b88b3d1d133fbe2800df5
Merge: 5379de657aee310b0eeb6a6ff3cf352ab16917fe ee9e1d997a5e63de9979bfb10b1fef79a8ed8435
Author: jorasse <jo...@ar...>
Date: Tue Sep 15 01:01:26 2009 +0200
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 5379de657aee310b0eeb6a6ff3cf352ab16917fe
Author: jorasse <jo...@ar...>
Date: Tue Sep 15 00:05:52 2009 +0200
changed quake patch to regular GIT files
commit e13405e7b5148fa0648f0115f8bd6379b1861dec
Author: jorasse <jo...@ar...>
Date: Mon Sep 14 23:55:08 2009 +0200
define mtd-utils default configuration
commit bae7d22ac99d7960c75f705719f07aefc74c90a9
Author: jorasse <jo...@ar...>
Date: Mon Sep 14 23:43:48 2009 +0200
update mtd-utils to support mkfs.ubifs and ubinize
commit 330444c4570f731144d30764da93711c7f9f3a35
Author: jorasse <jo...@ar...>
Date: Mon Sep 14 23:40:01 2009 +0200
update mtd-utils to support mkfs.ubifs and ubinize
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/apf27_test.config | 11 ++-
buildroot/local/apf9328_test/apf9328_test.config | 17 ++-
buildroot/package/games/quake-pak/Config.in | 7 +
buildroot/package/games/quake-pak/quake-pak.mk | 34 +++++
buildroot/package/games/sdlquake/Config.in | 10 ++
.../sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm | 35 +++++
buildroot/package/games/sdlquake/sdlquake.mk | 31 ++++
.../mtd-utils-all-targets.patch} | 4 +-
buildroot/package/mtd/mtd-utils20090824.git/mtd.mk | 152 +++++++++++++++++++
.../target/device/armadeus/apf27/apf27_defconfig | 11 ++-
.../device/armadeus/apf9328/apf9328_defconfig | 17 ++-
patches/buildroot/081-adds_quake_package.patch | 157 --------------------
.../buildroot/082-mtd-utils_with_ubi-utils.patch | 92 ++++++++++++
13 files changed, 409 insertions(+), 169 deletions(-)
create mode 100644 buildroot/package/games/quake-pak/Config.in
create mode 100644 buildroot/package/games/quake-pak/quake-pak.mk
create mode 100644 buildroot/package/games/sdlquake/Config.in
create mode 100644 buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
create mode 100644 buildroot/package/games/sdlquake/sdlquake.mk
copy buildroot/{target/ubifs/mkfs-ubifs-head.patch => package/mtd/mtd-utils20090824.git/mtd-utils-all-targets.patch} (83%)
create mode 100644 buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
delete mode 100644 patches/buildroot/081-adds_quake_package.patch
create mode 100644 patches/buildroot/082-mtd-utils_with_ubi-utils.patch
diff --git a/buildroot/local/apf27_test/apf27_test.config b/buildroot/local/apf27_test/apf27_test.config
index 9d2b65f..b57596f 100644
--- a/buildroot/local/apf27_test/apf27_test.config
+++ b/buildroot/local/apf27_test/apf27_test.config
@@ -506,9 +506,10 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_MEMTESTER is not set
# BR2_PACKAGE_MKDOSFS is not set
BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_UTILS=y
+# BR2_PACKAGE_MTD_UTILS is not set
# BR2_PACKAGE_MTD_20061007 is not set
# BR2_PACKAGE_MTD_20050122 is not set
+BR2_PACKAGE_MTD_UTILS_20090824GIT=y
# BR2_PACKAGE_MTD_UTILS_GIT is not set
#
@@ -529,10 +530,18 @@ BR2_PACKAGE_MTD_MKFSJFFS2=y
# BR2_PACKAGE_MTD_MKFSJFFS is not set
BR2_PACKAGE_MTD_MTD_DEBUG=y
BR2_PACKAGE_MTD_NANDDUMP=y
+BR2_PACKAGE_MTD_NANDTEST=y
BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
# BR2_PACKAGE_MTD_NFTLDUMP is not set
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_UBIATTACH=y
+BR2_PACKAGE_MTD_UBICRC32=y
+BR2_PACKAGE_MTD_UBIDETACH=y
+BR2_PACKAGE_MTD_UBIMKVOL=y
+BR2_PACKAGE_MTD_UBINFO=y
+BR2_PACKAGE_MTD_UBIRMVOL=y
+BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS-3G is not set
# BR2_PACKAGE_PCIUTILS is not set
# BR2_PACKAGE_PCMCIA is not set
diff --git a/buildroot/local/apf9328_test/apf9328_test.config b/buildroot/local/apf9328_test/apf9328_test.config
index 1daafc8..daa8609 100644
--- a/buildroot/local/apf9328_test/apf9328_test.config
+++ b/buildroot/local/apf9328_test/apf9328_test.config
@@ -504,9 +504,10 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_MEMTESTER is not set
# BR2_PACKAGE_MKDOSFS is not set
BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_UTILS=y
+# BR2_PACKAGE_MTD_UTILS is not set
# BR2_PACKAGE_MTD_20061007 is not set
# BR2_PACKAGE_MTD_20050122 is not set
+BR2_PACKAGE_MTD_UTILS_20090824GIT=y
# BR2_PACKAGE_MTD_UTILS_GIT is not set
#
@@ -526,11 +527,19 @@ BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
# BR2_PACKAGE_MTD_MKFSJFFS is not set
BR2_PACKAGE_MTD_MTD_DEBUG=y
-# BR2_PACKAGE_MTD_NANDDUMP is not set
-# BR2_PACKAGE_MTD_NANDWRITE is not set
+BR2_PACKAGE_MTD_NANDDUMP=y
+BR2_PACKAGE_MTD_NANDTEST=y
+BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
# BR2_PACKAGE_MTD_NFTLDUMP is not set
-# BR2_PACKAGE_MTD_SUMTOOL is not set
+BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_UBIATTACH=y
+BR2_PACKAGE_MTD_UBICRC32=y
+BR2_PACKAGE_MTD_UBIDETACH=y
+BR2_PACKAGE_MTD_UBIMKVOL=y
+BR2_PACKAGE_MTD_UBINFO=y
+BR2_PACKAGE_MTD_UBIRMVOL=y
+BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS-3G is not set
# BR2_PACKAGE_PCIUTILS is not set
# BR2_PACKAGE_PCMCIA is not set
diff --git a/buildroot/package/games/quake-pak/Config.in b/buildroot/package/games/quake-pak/Config.in
new file mode 100644
index 0000000..0341d49
--- /dev/null
+++ b/buildroot/package/games/quake-pak/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_QUAKE_PAK
+ bool "shareware Quake PAK/WAD file"
+ depends on BR2_PACKAGE_SDLQUAKE
+ help
+ This will install the shareware pak/wad data file for the Quake game.
+
+ The file will be placed in the /usr/share/games/quake/ directory.
diff --git a/buildroot/package/games/quake-pak/quake-pak.mk b/buildroot/package/games/quake-pak/quake-pak.mk
new file mode 100644
index 0000000..fbc620e
--- /dev/null
+++ b/buildroot/package/games/quake-pak/quake-pak.mk
@@ -0,0 +1,34 @@
+#############################################################
+#
+# Quake shareware data files (PAK/WAD)
+#
+#############################################################
+
+QUAKE_PAK_VERSION = 1.0.6
+QUAKE_PAK_SOURCE = quakesw-$(QUAKE_PAK_VERSION).tar.gz
+QUAKE_PAK_SITE = http://www.libsdl.org/projects/quake/data/
+QUAKE_PAK_CAT = $(ZCAT)
+QUAKE_PAK_TARGET_DIR = $(TARGET_DIR)/usr/share/games/quake/
+
+$(DL_DIR)/$(QUAKE_PAK_SOURCE):
+ $(WGET) -P $(DL_DIR) $(QUAKE_PAK_SITE)/$(QUAKE_PAK_SOURCE)
+
+quake-pak-source: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
+
+$(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
+ mkdir -p $(QUAKE_PAK_TARGET_DIR)
+ $(QUAKE_PAK_CAT) $(DL_DIR)/$(QUAKE_PAK_SOURCE) | tar -C $(QUAKE_PAK_TARGET_DIR) $(TAR_OPTIONS) -
+
+quake-pak: $(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak
+
+quake-pak-dirclean:
+ rm -rf $(QUAKE_PAK_TARGET_DIR)/id1/
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_QUAKE_PAK)),y)
+TARGETS+=quake-pak
+endif
diff --git a/buildroot/package/games/sdlquake/Config.in b/buildroot/package/games/sdlquake/Config.in
new file mode 100644
index 0000000..3cd8e51
--- /dev/null
+++ b/buildroot/package/games/sdlquake/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SDLQUAKE
+ bool "sdlquake"
+ select BR2_PACKAGE_SDL
+ select BR2_PACKAGE_SDL_MIXER
+ select BR2_PACKAGE_SDL_NET
+ help
+ sdlquake is a port of ID Software's popular Quake 3-D shooter game.
+ (Not supported by ID Software)
+
+ http://www.libsdl.org/projects/quake/
diff --git a/buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm b/buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
new file mode 100644
index 0000000..e87094b
--- /dev/null
+++ b/buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
@@ -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
+@@ -33,7 +33,6 @@
+ crc.h \
+ cvar.c \
+ cvar.h \
+- d_copy.S \
+ d_edge.c \
+ d_fill.c \
+ d_iface.h \
+@@ -48,7 +47,6 @@
+ d_sprite.c \
+ d_surf.c \
+ d_zpoint.c \
+- dosasm.S \
+ dosisms.h \
+ draw.c \
+ draw.h \
+@@ -103,7 +101,6 @@
+ r_sprite.c \
+ r_surf.c \
+ r_vars.c \
+- r_varsa.S \
+ render.h \
+ resource.h \
+ sbar.c \
+@@ -136,7 +133,7 @@
+ world.h \
+ zone.c \
+ zone.h \
+- $(X86_SRCS) $(NONX86_SRCS)
++ $(NONX86_SRCS)
+
+ X86_SRCS = \
+ snd_mixa.S \
diff --git a/buildroot/package/games/sdlquake/sdlquake.mk b/buildroot/package/games/sdlquake/sdlquake.mk
new file mode 100644
index 0000000..60f3f23
--- /dev/null
+++ b/buildroot/package/games/sdlquake/sdlquake.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# Quake 1 (SDL_Port)
+#
+#############################################################
+
+SDLQUAKE_VERSION = 1.0.9
+SDLQUAKE_SOURCE = sdlquake-$(SDLQUAKE_VERSION).tar.gz
+SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src/
+#SDLQUAKE_AUTORECONF = NO
+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_DEPENDENCIES = uclibc sdl sdl_mixer SDL_net
+
+$(eval $(call AUTOTARGETS,package/games,sdlquake))
+
+NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
+$(SDLQUAKE_TARGET_PATCH):
+ $(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
+ toolchain/patch-kernel.sh $($(PKG)_DIR) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1;
+ (cd $(SDLQUAKE_DIR); \
+ touch INSTALL NEWS README AUTHORS ChangeLog; \
+ echo "AC_PROG_CC" >> configure.in; \
+ aclocal; \
+ autoconf; \
+ automake --add-missing;)
+ touch $@
diff --git a/buildroot/target/ubifs/mkfs-ubifs-head.patch b/buildroot/package/mtd/mtd-utils20090824.git/mtd-utils-all-targets.patch
similarity index 83%
copy from buildroot/target/ubifs/mkfs-ubifs-head.patch
copy to buildroot/package/mtd/mtd-utils20090824.git/mtd-utils-all-targets.patch
index 07f3bab..9d4b502 100644
--- a/buildroot/target/ubifs/mkfs-ubifs-head.patch
+++ b/buildroot/package/mtd/mtd-utils20090824.git/mtd-utils-all-targets.patch
@@ -1,6 +1,6 @@
diff -purN mkfs-ubifs-HEAD/mkfs.ubifs.h mkfs-ubifs-HEAD.new/mkfs.ubifs.h
---- mkfs-ubifs-HEAD/mkfs.ubifs.h 2008-08-12 10:34:49.000000000 +0200
-+++ mkfs-ubifs-HEAD.new/mkfs.ubifs.h 2009-06-07 11:53:18.000000000 +0200
+--- mtd-utils/mkfs.ubifs/mkfs.ubifs.h 2008-08-12 10:34:49.000000000 +0200
++++ mtd-utils.new/mkfs.ubifs/mkfs.ubifs.h 2009-06-07 11:53:18.000000000 +0200
@@ -35,6 +35,7 @@
#include <byteswap.h>
#include <linux/types.h>
diff --git a/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk b/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
new file mode 100644
index 0000000..7e95223
--- /dev/null
+++ b/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
@@ -0,0 +1,152 @@
+#############################################################
+#
+# mtd provides jffs2 utilities
+#
+#############################################################
+MTD_VERSION:=a8ce7c2668ef0781326f629eef02cef6c3962b8a
+MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.gz
+MTD_URL:=http://git.infradead.org/mtd-utils.git?a=snapshot;h=$(MTD_VERSION);sf=tgz
+MTD_HOST_DIR:= $(TOOL_BUILD_DIR)/mtd-utils-$(MTD_VERSION)
+MTD_DIR:=$(BUILD_DIR)/mtd-utils-$(MTD_VERSION)
+MTD_CAT:=$(ZCAT)
+MTD_NAME:=mtd-utils
+
+#############################################################
+#
+# Build mkfs.jffs2 and sumtool for use on the local host system if
+# needed by target/jffs2root.
+#
+#############################################################
+MKFS_JFFS2 := $(MTD_HOST_DIR)/mkfs.jffs2
+SUMTOOL := $(MTD_HOST_DIR)/sumtool
+MKFS_UBIFS:= $(MTD_HOST_DIR)/mkfs.ubifs/mkfs.ubifs
+UBINIZE:= $(MTD_HOST_DIR)/ubi-utils/ubinize
+MTD_HOST_TARGETS:=$(MKFS_JFFS2) $(SUMTOOL) $(MKFS_UBIFS) $(UBINIZE)
+
+$(DL_DIR)/$(MTD_SOURCE):
+ $(WGET) -O $(DL_DIR)/$(MTD_SOURCE) "$(MTD_URL)"
+
+$(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
+ $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+ rm -rf $(MTD_HOST_DIR)
+ mv $(TOOL_BUILD_DIR)/$(MTD_NAME) $(MTD_HOST_DIR)
+ toolchain/patch-kernel.sh $(MTD_HOST_DIR) \
+ package/mtd/mtd-utils20090824.git mtd-utils-all\*.patch
+ toolchain/patch-kernel.sh $(MTD_HOST_DIR) \
+ package/mtd/mtd-utils20090824.git mtd-utils-host\*.patch
+ touch $@
+
+
+$(MTD_HOST_TARGETS): $(MTD_HOST_DIR)/.unpacked
+ CC="$(HOSTCC)" CROSS= CFLAGS=-I$(LINUX_HEADERS_DIR)/include \
+ $(MAKE) \
+ BUILDDIR=$(MTD_HOST_DIR) WITHOUT_XATTR=1 \
+ -C $(MTD_HOST_DIR)
+
+mtd-host: $(MTD_HOST_TARGETS)
+
+mtd-host-source: $(DL_DIR)/$(MTD_SOURCE)
+
+mtd-host-clean:
+ -$(MAKE) -C $(MTD_HOST_DIR) clean
+
+mtd-host-dirclean:
+ rm -rf $(MTD_HOST_DIR)
+
+#############################################################
+#
+# build mtd for use on the target system
+#
+#############################################################
+$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
+ $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ rm -rf $(MTD_DIR)
+ mv $(BUILD_DIR)/$(MTD_NAME) $(MTD_DIR)
+ toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils20090824.git mtd-utils-all\*.patch
+ toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils20090824.git mtd-utils-target\*.patch
+ touch $@
+
+MTD_TARGETS_n :=
+MTD_TARGETS_y :=
+
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL) += flash_eraseall
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO) += flash_info
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2
+MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDTEST) += nandtest
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug
+MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk
+MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios
+
+MTD_TARGETS_UBI_n :=
+MTD_TARGETS_UBI_y :=
+
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIATTACH) += ubiattach
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBICRC32) += ubicrc32
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIDETACH) += ubidetach
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMIRROR) += ubimirror
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMKVOL) += ubimkvol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINFO) += ubinfo
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL) += ubirmvol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol
+
+MTD_BUILD_TARGETS_JFFS2 := $(addprefix $(MTD_DIR)/, $(MTD_TARGETS_y))
+MTD_BUILD_TARGETS_UBI := $(addprefix $(MTD_DIR)/ubi-utils/, $(MTD_TARGETS_UBI_y))
+MTD_BUILD_TARGETS := $(MTD_BUILD_TARGETS_JFFS2) $(MTD_BUILD_TARGETS_UBI)
+
+$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked
+ mkdir -p $(TARGET_DIR)/usr/sbin
+ @echo $(MTD_TARGETS_y)
+ $(MAKE1) OPTFLAGS="-DNEED_BCOPY -Dbcmp=memcmp -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ BUILDDIR=$(MTD_DIR) \
+ CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) WITHOUT_XATTR=1 -C $(MTD_DIR) \
+ $(MTD_BUILD_TARGETS_JFFS2)
+
+ $(MAKE1) OPTFLAGS="-DNEED_BCOPY -Dbcmp=memcmp -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ BUILDDIR=$(MTD_DIR)/ubi-utils \
+ CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) WITHOUT_XATTR=1 -C $(MTD_DIR)/ubi-utils \
+ $(MTD_BUILD_TARGETS_UBI)
+
+MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y))
+MTD_UBI_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_UBI_y))
+
+$(MTD_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/%
+ cp -f $< $@
+ $(STRIPCMD) $@
+
+$(MTD_UBI_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/ubi-utils/%
+ cp -f $< $@
+ $(STRIPCMD) $@
+
+mtd: zlib lzo $(MTD_TARGETS) $(MTD_UBI_TARGETS)
+
+mtd-source: $(DL_DIR)/$(MTD_SOURCE)
+
+mtd-clean:
+ -$(MAKE) -C $(MTD_DIR) clean
+
+mtd-dirclean:
+ rm -rf $(MTD_DIR)
+
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_MTD)),y)
+TARGETS+=mtd
+endif
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index 9e7bc47..9b93364 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -504,9 +504,10 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_MEMTESTER is not set
# BR2_PACKAGE_MKDOSFS is not set
BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_UTILS=y
+# BR2_PACKAGE_MTD_UTILS is not set
# BR2_PACKAGE_MTD_20061007 is not set
# BR2_PACKAGE_MTD_20050122 is not set
+BR2_PACKAGE_MTD_UTILS_20090824GIT=y
# BR2_PACKAGE_MTD_UTILS_GIT is not set
#
@@ -527,10 +528,18 @@ BR2_PACKAGE_MTD_MKFSJFFS2=y
# BR2_PACKAGE_MTD_MKFSJFFS is not set
BR2_PACKAGE_MTD_MTD_DEBUG=y
BR2_PACKAGE_MTD_NANDDUMP=y
+BR2_PACKAGE_MTD_NANDTEST=y
BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
# BR2_PACKAGE_MTD_NFTLDUMP is not set
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_UBIATTACH=y
+BR2_PACKAGE_MTD_UBICRC32=y
+BR2_PACKAGE_MTD_UBIDETACH=y
+BR2_PACKAGE_MTD_UBIMKVOL=y
+BR2_PACKAGE_MTD_UBINFO=y
+BR2_PACKAGE_MTD_UBIRMVOL=y
+BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS-3G is not set
# BR2_PACKAGE_PCIUTILS is not set
# BR2_PACKAGE_PCMCIA is not set
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 6e86426..6198a75 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -500,9 +500,10 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_MEMTESTER is not set
# BR2_PACKAGE_MKDOSFS is not set
BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_UTILS=y
+# BR2_PACKAGE_MTD_UTILS is not set
# BR2_PACKAGE_MTD_20061007 is not set
# BR2_PACKAGE_MTD_20050122 is not set
+BR2_PACKAGE_MTD_UTILS_20090824GIT=y
# BR2_PACKAGE_MTD_UTILS_GIT is not set
#
@@ -522,11 +523,19 @@ BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
# BR2_PACKAGE_MTD_MKFSJFFS is not set
BR2_PACKAGE_MTD_MTD_DEBUG=y
-# BR2_PACKAGE_MTD_NANDDUMP is not set
-# BR2_PACKAGE_MTD_NANDWRITE is not set
+BR2_PACKAGE_MTD_NANDDUMP=y
+BR2_PACKAGE_MTD_NANDTEST=y
+BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
# BR2_PACKAGE_MTD_NFTLDUMP is not set
-# BR2_PACKAGE_MTD_SUMTOOL is not set
+BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_UBIATTACH=y
+BR2_PACKAGE_MTD_UBICRC32=y
+BR2_PACKAGE_MTD_UBIDETACH=y
+BR2_PACKAGE_MTD_UBIMKVOL=y
+BR2_PACKAGE_MTD_UBINFO=y
+BR2_PACKAGE_MTD_UBIRMVOL=y
+BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS-3G is not set
# BR2_PACKAGE_PCIUTILS is not set
# BR2_PACKAGE_PCMCIA is not set
diff --git a/patches/buildroot/081-adds_quake_package.patch b/patches/buildroot/081-adds_quake_package.patch
deleted file mode 100644
index 940748d..0000000
--- a/patches/buildroot/081-adds_quake_package.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-
-This patch adds Quake packages to buildroot:
-* Quake engine itself (SDL port)
-* a shareware data file (PAK/WAD) to test the engine
-
-It is inspired of OpenEmbedded work.
-
-sdlquake.mk could be simplier if a target FOO_HOOK_POST_INSTALL was
-existing in Makefile.autotools.in.
-
-Still searching a way to apply sdlquake-1.0.9-no-x86-asm.patch on all arch
-EXCEPT x86.
-
-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 2009-08-16 14:43:40.000000000 +0200
-@@ -0,0 +1,31 @@
-+#############################################################
-+#
-+# Quake 1 (SDL_Port)
-+#
-+#############################################################
-+
-+SDLQUAKE_VERSION = 1.0.9
-+SDLQUAKE_SOURCE = sdlquake-$(SDLQUAKE_VERSION).tar.gz
-+SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src/
-+#SDLQUAKE_AUTORECONF = NO
-+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_DEPENDENCIES = uclibc sdl sdl_mixer SDL_net
-+
-+$(eval $(call AUTOTARGETS,package/games,sdlquake))
-+
-+NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
-+$(SDLQUAKE_TARGET_PATCH):
-+ $(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
-+ toolchain/patch-kernel.sh $($(PKG)_DIR) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1;
-+ (cd $(SDLQUAKE_DIR); \
-+ touch INSTALL NEWS README AUTHORS ChangeLog; \
-+ echo "AC_PROG_CC" >> configure.in; \
-+ aclocal; \
-+ autoconf; \
-+ automake --add-missing;)
-+ touch $@
-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 2009-08-16 13:37:00.000000000 +0200
-@@ -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
-+@@ -33,7 +33,6 @@
-+ crc.h \
-+ cvar.c \
-+ cvar.h \
-+- d_copy.S \
-+ d_edge.c \
-+ d_fill.c \
-+ d_iface.h \
-+@@ -48,7 +47,6 @@
-+ d_sprite.c \
-+ d_surf.c \
-+ d_zpoint.c \
-+- dosasm.S \
-+ dosisms.h \
-+ draw.c \
-+ draw.h \
-+@@ -103,7 +101,6 @@
-+ r_sprite.c \
-+ r_surf.c \
-+ r_vars.c \
-+- r_varsa.S \
-+ render.h \
-+ resource.h \
-+ sbar.c \
-+@@ -136,7 +133,7 @@
-+ world.h \
-+ zone.c \
-+ zone.h \
-+- $(X86_SRCS) $(NONX86_SRCS)
-++ $(NONX86_SRCS)
-+
-+ X86_SRCS = \
-+ snd_mixa.S \
-Index: buildroot/package/games/sdlquake/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/Config.in 2009-08-16 14:51:17.000000000 +0200
-@@ -0,0 +1,10 @@
-+config BR2_PACKAGE_SDLQUAKE
-+ bool "sdlquake"
-+ select BR2_PACKAGE_SDL
-+ select BR2_PACKAGE_SDL_MIXER
-+ select BR2_PACKAGE_SDL_NET
-+ help
-+ sdlquake is a port of ID Software's popular Quake 3-D shooter game.
-+ (Not supported by ID Software)
-+
-+ http://www.libsdl.org/projects/quake/
-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 2009-08-16 15:50:54.000000000 +0200
-@@ -0,0 +1,34 @@
-+#############################################################
-+#
-+# Quake shareware data files (PAK/WAD)
-+#
-+#############################################################
-+
-+QUAKE_PAK_VERSION = 1.0.6
-+QUAKE_PAK_SOURCE = quakesw-$(QUAKE_PAK_VERSION).tar.gz
-+QUAKE_PAK_SITE = http://www.libsdl.org/projects/quake/data/
-+QUAKE_PAK_CAT = $(ZCAT)
-+QUAKE_PAK_TARGET_DIR = $(TARGET_DIR)/usr/share/games/quake/
-+
-+$(DL_DIR)/$(QUAKE_PAK_SOURCE):
-+ $(WGET) -P $(DL_DIR) $(QUAKE_PAK_SITE)/$(QUAKE_PAK_SOURCE)
-+
-+quake-pak-source: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
-+
-+$(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
-+ mkdir -p $(QUAKE_PAK_TARGET_DIR)
-+ $(QUAKE_PAK_CAT) $(DL_DIR)/$(QUAKE_PAK_SOURCE) | tar -C $(QUAKE_PAK_TARGET_DIR) $(TAR_OPTIONS) -
-+
-+quake-pak: $(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak
-+
-+quake-pak-dirclean:
-+ rm -rf $(QUAKE_PAK_TARGET_DIR)/id1/
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_QUAKE_PAK)),y)
-+TARGETS+=quake-pak
-+endif
-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 2009-08-16 15:46:54.000000000 +0200
-@@ -0,0 +1,7 @@
-+config BR2_PACKAGE_QUAKE_PAK
-+ bool "shareware Quake PAK/WAD file"
-+ depends on BR2_PACKAGE_SDLQUAKE
-+ help
-+ This will install the shareware pak/wad data file for the Quake game.
-+
-+ The file will be placed in the /usr/share/games/quake/ directory.
diff --git a/patches/buildroot/082-mtd-utils_with_ubi-utils.patch b/patches/buildroot/082-mtd-utils_with_ubi-utils.patch
new file mode 100644
index 0000000..31c060d
--- /dev/null
+++ b/patches/buildroot/082-mtd-utils_with_ubi-utils.patch
@@ -0,0 +1,92 @@
+
+This patch update mtd-utils to the august 24, 2009 GIT revision:
+* adds mkfs.ubifs tool
+* adds ubi-utils tools
+
+enable to build an UBI rootfs from scratch.
+
+Signed-off-by: jorasse <jo...@ar...>
+
+--- buildroot/package/mtd_ori/Config.in 2008-11-03 09:15:23.000000000 +0100
++++ buildroot/package/mtd/Config.in 2009-09-13 23:18:56.000000000 +0200
+@@ -28,6 +28,11 @@ config BR2_PACKAGE_MTD_20050122
+ help
+ Use the stable release.
+
++config BR2_PACKAGE_MTD_UTILS_20090824GIT
++ bool "Use MTD-utils from GIT aug 24, 2009"
++ help
++ Use the 24 aug 2009 GIT revision.
++
+ config BR2_PACKAGE_MTD_UTILS_GIT
+ bool "Use MTD-utils from GIT"
+ help
+@@ -127,7 +132,7 @@ config BR2_PACKAGE_MTD_NANDDUMP
+ config BR2_PACKAGE_MTD_NANDTEST
+ bool "nandtest"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_NANDWRITE
+ bool "nandwrite"
+@@ -152,17 +157,17 @@ config BR2_PACKAGE_MTD_SUMTOOL
+ config BR2_PACKAGE_MTD_UBIATTACH
+ bool "ubiattach"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBICRC32
+ bool "ubicrc32"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBIDETACH
+ bool "ubidetach"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBIMIRROR
+ bool "ubimirror"
+@@ -172,22 +177,22 @@ config BR2_PACKAGE_MTD_UBIMIRROR
+ config BR2_PACKAGE_MTD_UBIMKVOL
+ bool "ubimkvol"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBINFO
+ bool "ubinfo"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBIRMVOL
+ bool "ubirmvol"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ config BR2_PACKAGE_MTD_UBIUPDATEVOL
+ bool "ubiupdatevol"
+ default y
+- depends on BR2_PACKAGE_MTD_UTILS_GIT
++ depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
+
+ endif
+
+--- buildroot/package/mtd_ori/mtd.mk 2008-11-03 09:15:23.000000000 +0100
++++ buildroot/package/mtd/mtd.mk 2009-09-13 12:10:23.000000000 +0200
+@@ -7,6 +7,9 @@ endif
+ ifeq ($(strip $(BR2_PACKAGE_MTD_20050122)),y)
+ include package/mtd/20050122/mtd.mk
+ endif
++ifeq ($(strip $(BR2_PACKAGE_MTD_UTILS_20090824GIT)),y)
++include package/mtd/mtd-utils20090824.git/mtd.mk
++endif
+ ifeq ($(strip $(BR2_PACKAGE_MTD_UTILS_GIT)),y)
+ include package/mtd/mtd-utils.git/mtd.mk
+ endif
hooks/post-receive
--
armadeus
|
