diff options
Diffstat (limited to 'package/mtd/mtd-utils.git')
| -rw-r--r-- | package/mtd/mtd-utils.git/mtd-utils-all-argp.patch | 10 | ||||
| -rw-r--r-- | package/mtd/mtd-utils.git/mtd-utils-all-targets.patch | 34 | ||||
| -rw-r--r-- | package/mtd/mtd-utils.git/mtd-utils-target-acl.patch | 48 | ||||
| -rw-r--r-- | package/mtd/mtd-utils.git/mtd-utils-target-llzo.patch | 10 | ||||
| -rw-r--r-- | package/mtd/mtd-utils.git/mtd-utils-target-lzo-header.patch | 14 | ||||
| -rw-r--r-- | package/mtd/mtd-utils.git/mtd.mk | 144 |
6 files changed, 260 insertions, 0 deletions
diff --git a/package/mtd/mtd-utils.git/mtd-utils-all-argp.patch b/package/mtd/mtd-utils.git/mtd-utils-all-argp.patch new file mode 100644 index 000000000..04ea332c1 --- /dev/null +++ b/package/mtd/mtd-utils.git/mtd-utils-all-argp.patch @@ -0,0 +1,10 @@ +--- mtd-utils-e6088d987c545d60a86e1f44836ab8ba072fffd9/ubi-utils/new-utils/src/ubicrc32.c.orig 2008-03-26 16:08:13.000000000 +1100 ++++ mtd-utils-e6088d987c545d60a86e1f44836ab8ba072fffd9/ubi-utils/new-utils/src/ubicrc32.c 2008-03-26 16:08:20.000000000 +1100 +@@ -26,7 +26,6 @@ + #include <stdint.h> + #include <stdlib.h> + #include <getopt.h> +-#include <argp.h> + #include <unistd.h> + #include <mtd/ubi-header.h> + diff --git a/package/mtd/mtd-utils.git/mtd-utils-all-targets.patch b/package/mtd/mtd-utils.git/mtd-utils-all-targets.patch new file mode 100644 index 000000000..e887118e2 --- /dev/null +++ b/package/mtd/mtd-utils.git/mtd-utils-all-targets.patch @@ -0,0 +1,34 @@ +diff -urN mtd-utils-1.1.0-0rig/Makefile mtd-utils-1.1.0/Makefile +--- mtd-utils-1.1.0-0rig/Makefile 2007-08-03 15:55:51.000000000 +0200 ++++ mtd-utils-1.1.0/Makefile 2007-09-27 08:20:55.000000000 +0200 +@@ -72,6 +72,30 @@ + $(BUILDDIR)/sumtool: $(BUILDDIR)/sumtool.o $(BUILDDIR)/crc32.o + $(CC) $(LDFLAGS) -o $@ $^ + ++ftl_format: $(BUILDDIR)/ftl_format ++flash_erase: $(BUILDDIR)/flash_erase ++flash_eraseall: $(BUILDDIR)/flash_eraseall ++nanddump: $(BUILDDIR)/nanddump ++doc_loadbios: $(BUILDDIR)/doc_loadbios ++mkfs.jffs: $(BUILDDIR)/mkfs.jffs ++ftl_check: $(BUILDDIR)/ftl_check ++mkfs.jffs2: $(BUILDDIR)/mkfs.jffs2 ++flash_lock: $(BUILDDIR)/flash_lock ++flash_unlock: $(BUILDDIR)/flash_unlock ++flash_info: $(BUILDDIR)/flash_info ++flash_otp_info: $(BUILDDIR)/flash_otp_info ++flash_otp_dump: $(BUILDDIR)/flash_otp_dump ++mtd_debug: $(BUILDDIR)/mtd_debug ++flashcp: $(BUILDDIR)/flashcp ++nandwrite: $(BUILDDIR)/nandwrite ++jffs2dump: $(BUILDDIR)/jffs2dump ++nftldump: $(BUILDDIR)/nftldump ++nftl_format: $(BUILDDIR)/nftl_format ++docfdisk: $(BUILDDIR)/docfdisk ++rfddump: $(BUILDDIR)/rfddump ++rfdformat: $(BUILDDIR)/rfdformat ++sumtool: $(BUILDDIR)/sumtool ++ + install: ${TARGETS} + mkdir -p ${DESTDIR}/${SBINDIR} + install -m0755 ${TARGETS} ${DESTDIR}/${SBINDIR}/ diff --git a/package/mtd/mtd-utils.git/mtd-utils-target-acl.patch b/package/mtd/mtd-utils.git/mtd-utils-target-acl.patch new file mode 100644 index 000000000..953786eb1 --- /dev/null +++ b/package/mtd/mtd-utils.git/mtd-utils-target-acl.patch @@ -0,0 +1,48 @@ +Author: Ulf Samuelsson +Date: 2007-01-25 + +Log: +Patch adding "sys/acl.h" needed to compile mtd. + +Modified: + package/mtd/mtd_acl.patch + +Changeset + package/mtd/mtd_acl.patch + +diff -urN mtd_orig-0rig/include/sys/acl.h mtd_orig/include/sys/acl.h +--- mtd_orig-0rig/include/sys/acl.h 1970-01-01 01:00:00.000000000 +0100 ++++ mtd_orig/include/sys/acl.h 2007-01-17 20:11:22.000000000 +0100 +@@ -0,0 +1,32 @@ ++/* ++ File: linux/posix_acl.h ++ ++ (C) 2002 Andreas Gruenbacher, <a.gruenbacher@computer.org> ++*/ ++ ++ ++#ifndef __LINUX_POSIX_ACL_H ++#define __LINUX_POSIX_ACL_H ++ ++#define ACL_UNDEFINED_ID (-1) ++ ++/* a_type field in acl_user_posix_entry_t */ ++#define ACL_TYPE_ACCESS (0x8000) ++#define ACL_TYPE_DEFAULT (0x4000) ++ ++/* e_tag entry in struct posix_acl_entry */ ++#define ACL_USER_OBJ (0x01) ++#define ACL_USER (0x02) ++#define ACL_GROUP_OBJ (0x04) ++#define ACL_GROUP (0x08) ++#define ACL_MASK (0x10) ++#define ACL_OTHER (0x20) ++ ++/* permissions in the e_perm field */ ++#define ACL_READ (0x04) ++#define ACL_WRITE (0x02) ++#define ACL_EXECUTE (0x01) ++//#define ACL_ADD (0x08) ++//#define ACL_DELETE (0x10) ++ ++#endif /* __LINUX_POSIX_ACL_H */ diff --git a/package/mtd/mtd-utils.git/mtd-utils-target-llzo.patch b/package/mtd/mtd-utils.git/mtd-utils-target-llzo.patch new file mode 100644 index 000000000..6252cfa83 --- /dev/null +++ b/package/mtd/mtd-utils.git/mtd-utils-target-llzo.patch @@ -0,0 +1,10 @@ +diff -urN mtd-utils-1.1.0-0rig/Makefile mtd-utils-1.1.0/Makefile +--- mtd-utils-1.1.0-0rig/Makefile 2007-08-03 15:55:51.000000000 +0200 ++++ mtd-utils-1.1.0/Makefile 2007-09-27 08:20:55.000000000 +0200 +@@ -63,7 +63,7 @@ + $(BUILDDIR)/compr_lzo.o \ + $(BUILDDIR)/compr.o \ + $(BUILDDIR)/rbtree.o +- $(CC) $(LDFLAGS) -o $@ $^ -lz -llzo2 ++ $(CC) $(LDFLAGS) -o $@ $^ -lz -llzo + diff --git a/package/mtd/mtd-utils.git/mtd-utils-target-lzo-header.patch b/package/mtd/mtd-utils.git/mtd-utils-target-lzo-header.patch new file mode 100644 index 000000000..64b0e55c5 --- /dev/null +++ b/package/mtd/mtd-utils.git/mtd-utils-target-lzo-header.patch @@ -0,0 +1,14 @@ +diff -urN mtd-utils-1.1.0-0rig/compr_lzo.c mtd-utils-1.1.0/compr_lzo.c +--- mtd-utils-1.1.0-0rig/compr_lzo.c 2007-08-03 15:55:51.000000000 +0200 ++++ mtd-utils-1.1.0/compr_lzo.c 2007-09-27 08:18:05.000000000 +0200 +@@ -26,7 +26,7 @@ + #include <string.h> + #include <asm/types.h> + #include <linux/jffs2.h> +-#include <lzo/lzo1x.h> ++#include <lzo1x.h> + #include "compr.h" + + extern int page_size; + $(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o + $(CC) $(LDFLAGS) -o $@ $^ diff --git a/package/mtd/mtd-utils.git/mtd.mk b/package/mtd/mtd-utils.git/mtd.mk new file mode 100644 index 000000000..79512abd5 --- /dev/null +++ b/package/mtd/mtd-utils.git/mtd.mk @@ -0,0 +1,144 @@ +############################################################# +# +# mtd provides jffs2 utilities +# +############################################################# +MTD_VERSION:=$(strip $(subst ",, $(BR2_PACKAGE_MTD_UTILS_GIT_COMMIT_ID))) +#")) +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 + +$(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-utils.git mtd-utils-all\*.patch + toolchain/patch-kernel.sh $(MTD_HOST_DIR) \ + package/mtd/mtd-utils.git mtd-utils-host\*.patch + touch $@ + + +$(MKFS_JFFS2): $(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) mkfs.jffs2 + +$(SUMTOOL): $(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) sumtool + +mtd-host: $(MKFS_JFFS2) $(SUMTOOL) + +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) - + mv $(BUILD_DIR)/$(MTD_NAME) $(MTD_DIR) + toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils.git mtd-utils-all\*.patch + toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils.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 := $(addprefix $(MTD_DIR)/, $(MTD_TARGETS_y)) $(addprefix $(MTD_DIR)/ubi-utils/, $(MTD_TARGETS_UBI_y)) + +$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked + mkdir -p $(TARGET_DIR)/usr/sbin + $(MAKE) OPTFLAGS="-DNEED_BCOPY -Dbcmp=memcmp -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \ + BUILDDIR=$(MTD_DIR) \ + CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) WITHOUT_XATTR=1 -C $(MTD_DIR) + +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 |