diff options
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | patches/mtd-utils-1.0.0/generic/mtd-cppflags.diff | 22 | ||||
| -rw-r--r-- | patches/mtd-utils-1.0.0/generic/series | 1 | ||||
| -rw-r--r-- | patches/mtd-utils-1.0.1/generic/mtd-cppflags.diff | 32 | ||||
| -rw-r--r-- | patches/mtd-utils-1.0.1/generic/series | 1 | ||||
| -rw-r--r-- | rules/host-mtd-utils.in | 3 | ||||
| -rw-r--r-- | rules/host-mtd-utils.make | 92 | ||||
| -rw-r--r-- | rules/host-mtd.in | 30 | ||||
| -rw-r--r-- | rules/host-mtd.make | 125 | ||||
| -rw-r--r-- | rules/mtd-utils.in (renamed from rules/mtd.in) | 47 | ||||
| -rw-r--r-- | rules/mtd-utils.make | 176 | ||||
| -rw-r--r-- | rules/mtd.make | 230 |
12 files changed, 351 insertions, 411 deletions
@@ -26,6 +26,9 @@ TODO for 0.10.6 [ ] rsc: merge mkl's host/cross/target-pkg-config fixes. We need this to have a proper x.org and host-dbus. [ ] rsc: fix 'ptxdist newpacket host' +[ ] rsc: check if we can update mtd-utils from 1.0.0 to 1.0.1; mkl has + already prepared the patches; find out why the revision number was + not bumped. TODO for 0.10.5 =============== diff --git a/patches/mtd-utils-1.0.0/generic/mtd-cppflags.diff b/patches/mtd-utils-1.0.0/generic/mtd-cppflags.diff index 9c9486bfa..1e3066b89 100644 --- a/patches/mtd-utils-1.0.0/generic/mtd-cppflags.diff +++ b/patches/mtd-utils-1.0.0/generic/mtd-cppflags.diff @@ -17,9 +17,25 @@ # unknown # ---- mtd-utils-1.0.0/Makefile.orig 2006-05-02 16:48:44.316560880 +0200 -+++ mtd-utils-1.0.0/Makefile 2006-05-02 16:48:58.853350952 +0200 -@@ -24,7 +24,7 @@ +Index: mtd-utils-1.0.0/Makefile +=================================================================== +--- mtd-utils-1.0.0.orig/Makefile ++++ mtd-utils-1.0.0/Makefile +@@ -3,9 +3,10 @@ + + # $Id: Makefile,v 1.60 2005/11/07 11:15:09 gleixner Exp $ + +-SBINDIR=/usr/sbin +-MANDIR=/usr/man +-INCLUDEDIR=/usr/include ++PREFIX=/usr ++SBINDIR=$(PREFIX)/sbin ++MANDIR=$(PREFIX)/share/man ++INCLUDEDIR=$(PREFIX)/include + #CROSS=arm-linux- + CC := $(CROSS)gcc + CFLAGS := -I./include -O2 -Wall +@@ -24,7 +25,7 @@ SYMLINKS = $(CC) $(LDFLAGS) -g -o $@ $^ %.o: %.c diff --git a/patches/mtd-utils-1.0.0/generic/series b/patches/mtd-utils-1.0.0/generic/series new file mode 100644 index 000000000..7453d73ab --- /dev/null +++ b/patches/mtd-utils-1.0.0/generic/series @@ -0,0 +1 @@ +mtd-cppflags.diff diff --git a/patches/mtd-utils-1.0.1/generic/mtd-cppflags.diff b/patches/mtd-utils-1.0.1/generic/mtd-cppflags.diff new file mode 100644 index 000000000..90db2f852 --- /dev/null +++ b/patches/mtd-utils-1.0.1/generic/mtd-cppflags.diff @@ -0,0 +1,32 @@ +# +# Submitted-By: Robert Schwebel, 2005-03-13 +# Committed-By: Robert Schwebel +# +# Error: +# +# MTD utilities forget to use the preprocessor flags; as we feed in +# special include directories via -isystem in PTXdist this is not used +# and crashes. +# +# Description: +# +# no public discussion about this topic yet. +# +# State: +# +# unknown +# + +Index: mtd-utils-1.0.1/Makefile +=================================================================== +--- mtd-utils-1.0.1.orig/Makefile ++++ mtd-utils-1.0.1/Makefile +@@ -34,7 +34,7 @@ SYMLINKS = + + $(BUILDDIR)/%.o: %.c + mkdir -p $(BUILDDIR) +- $(CC) $(CFLAGS) -g -c -o $@ $< -g -Wp,-MD,$(BUILDDIR)/.$(<F).dep ++ $(CC) $(CFLAGS) $(CPPFLAGS) -g -c -o $@ $< -g -Wp,-MD,$(BUILDDIR)/.$(<F).dep + + .SUFFIXES: + diff --git a/patches/mtd-utils-1.0.1/generic/series b/patches/mtd-utils-1.0.1/generic/series new file mode 100644 index 000000000..7453d73ab --- /dev/null +++ b/patches/mtd-utils-1.0.1/generic/series @@ -0,0 +1 @@ +mtd-cppflags.diff diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in new file mode 100644 index 000000000..994e526b3 --- /dev/null +++ b/rules/host-mtd-utils.in @@ -0,0 +1,3 @@ +config HOST_MTD_UTILS + bool + select HOST_ZLIB diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make new file mode 100644 index 000000000..793d454cc --- /dev/null +++ b/rules/host-mtd-utils.make @@ -0,0 +1,92 @@ +# -*-makefile-*- +# $Id$ +# +# Copyright (C) 2003-2006 by Pengutronix e.K., Hildesheim, Germany +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_MTD_UTILS) += host-mtd-utils + +# +# Paths and names +# +HOST_MTD_UTILS_DIR = $(HOST_BUILDDIR)/$(MTD_UTILS) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +host-mtd-utils_get: $(STATEDIR)/host-mtd-utils.get + +$(STATEDIR)/host-mtd-utils.get: $(STATEDIR)/mtd-utils.get + @$(call targetinfo, $@) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +host-mtd-utils_extract: $(STATEDIR)/host-mtd-utils.extract + +$(STATEDIR)/host-mtd-utils.extract: $(host-mtd-utils_extract_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(HOST_MTD_UTILS_DIR)) + @$(call extract, MTD_UTILS, $(HOST_BUILDDIR)) + @$(call patchin, MTD_UTILS, $(HOST_MTD_UTILS_DIR)) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +host-mtd-utils_prepare: $(STATEDIR)/host-mtd-utils.prepare + +HOST_MTD_UTILS_PATH := PATH=$(HOST_PATH) +HOST_MTD_UTILS_ENV := $(HOST_ENV) +HOST_MTD_UTILS_MAKEVARS := \ + CPPFLAGS="$(HOST_CPPFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" \ + PREFIX="$(PTX_PREFIX_HOST)" + +$(STATEDIR)/host-mtd-utils.prepare: $(host-mtd-utils_prepare_deps_default) + @$(call targetinfo, $@) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +host-mtd-utils_compile: $(STATEDIR)/host-mtd-utils.compile + +$(STATEDIR)/host-mtd-utils.compile: $(host-mtd-utils_compile_deps_default) + @$(call targetinfo, $@) + cd $(HOST_MTD_UTILS_DIR) && $(HOST_MTD_UTILS_PATH) $(MAKE) $(PARALLELMFLAGS) $(HOST_MTD_UTILS_MAKEVARS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +host-mtd-utils_install: $(STATEDIR)/host-mtd-utils.install + +$(STATEDIR)/host-mtd-utils.install: $(host-mtd-utils_install_deps_default) + @$(call targetinfo, $@) + @$(call install, HOST_MTD_UTILS,,h) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +host-mtd-utils_clean: + rm -rf $(STATEDIR)/host-mtd-utils.* + rm -rf $(HOST_MTD_UTILS_DIR) + +# vim: syntax=make diff --git a/rules/host-mtd.in b/rules/host-mtd.in deleted file mode 100644 index f002361bd..000000000 --- a/rules/host-mtd.in +++ /dev/null @@ -1,30 +0,0 @@ -menuconfig HOST_MTD - bool "mtd utils " - help - FIXME: This item needs to be documented - -config HOST_MTD_MKJFFS - bool "mkfs.jffs" - depends on HOST_MTD - help - FIXME: This item needs to be documented - -config HOST_MTD_MKJFFS2 - bool "mkfs.jffs2" - depends on HOST_MTD - help - FIXME: This item needs to be documented - -config HOST_MTD_JFFS_DUMP - bool - prompt "jffs_dump" - depends on HOST_MTD - help - FIXME: This item needs to be documented - -config HOST_MTD_JFFS2_DUMP - bool - prompt "jffs2_dump" - depends on HOST_MTD - help - FIXME: This item needs to be documented diff --git a/rules/host-mtd.make b/rules/host-mtd.make deleted file mode 100644 index 0e65840f2..000000000 --- a/rules/host-mtd.make +++ /dev/null @@ -1,125 +0,0 @@ -# -*-makefile-*- -# $Id$ -# -# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -HOST_PACKAGES-$(PTXCONF_HOST_MTD) += host-mtd - -# -# Paths and names -# -HOST_MTD = $(MTD_UTILS) -HOST_MTD_DIR = $(HOST_BUILDDIR)/$(HOST_MTD) - - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -host-mtd_get: $(STATEDIR)/host-mtd.get - -$(STATEDIR)/host-mtd.get: $(STATEDIR)/mtd.get - @$(call targetinfo, $@) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -host-mtd_extract: $(STATEDIR)/host-mtd.extract - -$(STATEDIR)/host-mtd.extract: $(host-mtd_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(HOST_MTD_DIR)) - @$(call extract, MTD_UTILS, $(HOST_BUILDDIR)) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -host-mtd_prepare: $(STATEDIR)/host-mtd.prepare - -HOST_MTD_MAKEVARS = \ - $(HOSTCC_ENV) \ - CFLAGS="-I$(PTXCONF_PREFIX)/include -I$(HOST_MTD_DIR)/include" \ - LDFLAGS=-L$(PTXCONF_PREFIX)/lib - -$(STATEDIR)/host-mtd.prepare: $(host-mtd_prepare_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -host-mtd_compile: $(STATEDIR)/host-mtd.compile - -$(STATEDIR)/host-mtd.compile: $(host-mtd_compile_deps_default) - @$(call targetinfo, $@) -ifdef PTXCONF_HOST_MTD_MKJFFS - cd $(HOST_MTD_DIR) && make mkfs.jffs $(HOST_MTD_MAKEVARS) -endif -ifdef PTXCONF_HOST_MTD_MKJFFS2 - cd $(HOST_MTD_DIR) && make mkfs.jffs2 $(HOST_MTD_MAKEVARS) -endif -ifdef PTXCONF_HOST_MTD_JFFS_DUMP - cd $(HOST_MTD_DIR) && make jffs-dump $(HOST_MTD_MAKEVARS) -endif -ifdef PTXCONF_HOST_MTD_JFFS2_DUMP - cd $(HOST_MTD_DIR) && make jffs2dump $(HOST_MTD_MAKEVARS) -endif - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -host-mtd_install: $(STATEDIR)/host-mtd.install - -$(STATEDIR)/host-mtd.install: $(host-mtd_install_deps_default) - @$(call targetinfo, $@) - mkdir -p $(PTXCONF_PREFIX)/bin - -ifdef PTXCONF_HOST_MTD_MKJFFS - install $(HOST_MTD_DIR)/mkfs.jffs $(PTXCONF_PREFIX)/bin -endif -ifdef PTXCONF_HOST_MTD_MKJFFS2 - install $(HOST_MTD_DIR)/mkfs.jffs2 $(PTXCONF_PREFIX)/bin -endif -ifdef PTXCONF_HOST_MTD_JFFS_DUMP - install $(HOST_MTD_DIR)/jffs-dump $(PTXCONF_PREFIX)/bin -endif -ifdef PTXCONF_HOST_MTD_JFFS2_DUMP - install $(HOST_MTD_DIR)/jffs2dump $(PTXCONF_PREFIX)/bin -endif - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -host-mtd_targetinstall: $(STATEDIR)/host-mtd.targetinstall - -$(STATEDIR)/host-mtd.targetinstall: $(host-mtd_targetinstall_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -host-mtd_clean: - rm -rf $(STATEDIR)/host-mtd.* - rm -rf $(HOST_MTD_DIR) - -# vim: syntax=make diff --git a/rules/mtd.in b/rules/mtd-utils.in index 5cc534652..ae75b05f8 100644 --- a/rules/mtd.in +++ b/rules/mtd-utils.in @@ -4,132 +4,133 @@ menuconfig MTD_UTILS help FIXME: This item needs to be documented -config MTD_FLASH_ERASE +config MTD_UTILS_FLASH_ERASE bool prompt "flash_erase" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_FLASH_ERASEALL +config MTD_UTILS_FLASH_ERASEALL bool prompt "flash_eraseall" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_FLASH_INFO +config MTD_UTILS_FLASH_INFO bool prompt "flash_info" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_FLASH_LOCK +config MTD_UTILS_FLASH_LOCK bool prompt "flash_lock" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_FLASH_UNLOCK +config MTD_UTILS_FLASH_UNLOCK bool prompt "flash_unlock" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_FLASHCP +config MTD_UTILS_FLASHCP bool prompt "flashcp" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_FTL_CHECK +config MTD_UTILS_FTL_CHECK bool prompt "ftl_check" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_FTL_FORMAT +config MTD_UTILS_FTL_FORMAT bool prompt "ftl_format" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_JFFS_DUMP +config MTD_UTILS_JFFS_DUMP bool prompt "jffs_dump" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_JFFS2_DUMP +config MTD_UTILS_JFFS2_DUMP bool prompt "jffs2_dump" depends on MTD_UTILS help FIXME: This item needs to be documented -# currently broken as of 2004-06-21 -#config MTD_JFFS2READER -# bool -# prompt "jffs2reader" -# depends on MTD_UTILS +config MTD_UTILS_JFFS2READER + bool + prompt "jffs2reader" + depends on MTD_UTILS + help + FIXME: This item needs to be documented -config MTD_JITTERTEST +config MTD_UTILS_JITTERTEST bool prompt "jittertest" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_MTDDEBUG +config MTD_UTILS_MTDDEBUG bool prompt "mtd_debug" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_NANDDUMP +config MTD_UTILS_NANDDUMP bool prompt "nanddump" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_NANDWRITE +config MTD_UTILS_NANDWRITE bool prompt "nandwrite" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_NFTL_FORMAT +config MTD_UTILS_NFTL_FORMAT bool prompt "nftl_format" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_NFTLDUMP +config MTD_UTILS_NFTLDUMP bool prompt "nftldump" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_MKJFFS +config MTD_UTILS_MKJFFS bool prompt "mkfs.jffs" depends on MTD_UTILS help FIXME: This item needs to be documented -config MTD_MKJFFS2 +config MTD_UTILS_MKJFFS2 bool prompt "mkfs.jffs2" depends on MTD_UTILS diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make new file mode 100644 index 000000000..ea24ef1be --- /dev/null +++ b/rules/mtd-utils.make @@ -0,0 +1,176 @@ +# -*-makefile-*- +# $Id$ +# +# Copyright (C) 2003-2006 by Pengutronix e.K., Hildesheim, Germany +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils + +# +# Paths and names +# +MTD_UTILS_VERSION := 1.0.0 +MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) +MTD_UTILS_SUFFIX := tar.gz +MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) +MTD_UTILS_SOURCE := $(SRCDIR)/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) +MTD_UTILS_DIR := $(BUILDDIR)/$(MTD_UTILS) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +mtd-utils_get: $(STATEDIR)/mtd-utils.get + +$(STATEDIR)/mtd-utils.get: $(mtd-utils_get_deps_default) + @$(call targetinfo, $@) + @$(call touch, $@) + +$(MTD_UTILS_SOURCE): + @$(call targetinfo, $@) + @$(call get, MTD_UTILS) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +mtd-utils_extract: $(STATEDIR)/mtd-utils.extract + +$(STATEDIR)/mtd-utils.extract: $(mtd-utils_extract_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(MTD_UTILS_DIR)) + @$(call extract, MTD_UTILS) + @$(call patchin, MTD_UTILS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +mtd-utils_prepare: $(STATEDIR)/mtd-utils.prepare + +MTD_UTILS_PATH := PATH=$(CROSS_PATH) +MTD_UTILS_ENV := $(CROSS_ENV) +MTD_UTILS_MAKEVARS := CROSS=$(COMPILER_PREFIX) + +$(STATEDIR)/mtd-utils.prepare: $(mtd-utils_prepare_deps_default) + @$(call targetinfo, $@) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +mtd-utils_compile: $(STATEDIR)/mtd-utils.compile + +$(STATEDIR)/mtd-utils.compile: $(mtd-utils_compile_deps_default) + @$(call targetinfo, $@) + cd $(MTD_UTILS_DIR) && $(MTD_UTILS_PATH) $(MAKE) $(PARALLELMFLAGS) $(MTD_UTILS_MAKEVARS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +mtd-utils_install: $(STATEDIR)/mtd-utils.install + +$(STATEDIR)/mtd-utils.install: $(mtd-utils_install_deps_default) + @$(call targetinfo, $@) + @$(call install, MTD_UTILS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +mtd-utils_targetinstall: $(STATEDIR)/mtd-utils.targetinstall + +$(STATEDIR)/mtd-utils.targetinstall: $(mtd-utils_targetinstall_deps_default) + @$(call targetinfo, $@) + + @$(call install_init, mtd-utils) + @$(call install_fixup, mtd-utils,PACKAGE,mtd-utils) + @$(call install_fixup, mtd-utils,PRIORITY,optional) + @$(call install_fixup, mtd-utils,VERSION,$(MTD_UTILS_VERSION)) + @$(call install_fixup, mtd-utils,SECTION,base) + @$(call install_fixup, mtd-utils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, mtd-utils,DEPENDS,) + @$(call install_fixup, mtd-utils,DESCRIPTION,missing) + +ifdef PTXCONF_MTD_UTILS_FLASH_ERASE + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/flash_erase, /sbin/flash_erase) +endif +ifdef PTXCONF_MTD_UTILS_FLASH_ERASEALL + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/flash_eraseall, /sbin/flash_eraseall) +endif +ifdef PTXCONF_MTD_UTILS_FLASH_INFO + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/flash_info, /sbin/flash_info) +endif +ifdef PTXCONF_MTD_UTILS_FLASH_LOCK + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/flash_lock, /sbin/flash_lock) +endif +ifdef PTXCONF_MTD_UTILS_FLASH_UNLOCK + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/flash_unlock, /sbin/flash_unlock) +endif +ifdef PTXCONF_MTD_UTILS_FLASHCP + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/flashcp, /sbin/flashcp) +endif +ifdef PTXCONF_MTD_UTILS_FTL_CHECK + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/ftl_check, /sbin/ftl_check) +endif +ifdef PTXCONF_MTD_UTILS_FTL_FORMAT + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/ftl_format, /sbin/ftl_format) +endif +ifdef PTXCONF_MTD_UTILS_JFFS_DUMP + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/jffs-dump, /sbin/jffs-dump) +endif +ifdef PTXCONF_MTD_UTILS_JFFS2_DUMP + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/jffs2dump, /sbin/jffs2dump) +endif +ifdef PTXCONF_MTD_UTILS_JFFS2READER + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/jffs2reader, /sbin/jffs2reader) +endif +ifdef PTXCONF_MTD_UTILS_MTDDEBUG + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/mtd_debug, /sbin/mtd_debug) +endif +ifdef PTXCONF_MTD_UTILS_NANDDUMP + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/nanddump, /sbin/nanddump) +endif +ifdef PTXCONF_MTD_UTILS_NANDWRITE + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/nandwrite, /sbin/nandwrite) +endif +ifdef PTXCONF_MTD_UTILS_NFTL_FORMAT + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/nftl_format, /sbin/nftl_format) +endif +ifdef PTXCONF_MTD_UTILS_NFTLDUMP + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/nftldump, /sbin/nftldump) +endif +ifdef PTXCONF_MTD_UTILS_MKJFFS + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/mkfs.jffs, /sbin/mkfs.jffs) +endif +ifdef PTXCONF_MTD_UTILS_MKJFFS2 + @$(call install_copy, mtd-utils, 0, 0, 0755, $(MTD_UTILS_DIR)/mkfs.jffs2, /sbin/mkfs.jffs2) +endif + + @$(call install_finish, mtd-utils) + + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +mtd-utils_clean: + rm -rf $(STATEDIR)/mtd-utils.* + rm -rf $(IMAGEDIR)/mtd-utils_* + rm -rf $(MTD_UTILS_DIR) + +# vim: syntax=make diff --git a/rules/mtd.make b/rules/mtd.make deleted file mode 100644 index f5f39356f..000000000 --- a/rules/mtd.make +++ /dev/null @@ -1,230 +0,0 @@ -# -*-makefile-*- -# $Id$ -# -# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_MTD_UTILS) += mtd - -# -# Paths and names -# -MTD_UTILS_VERSION = 1.0.0 -MTD_UTILS = mtd-utils-$(MTD_UTILS_VERSION) -MTD_UTILS_SUFFIX = tar.gz -MTD_UTILS_URL = ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) -MTD_UTILS_SOURCE = $(SRCDIR)/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) -MTD_UTILS_DIR = $(BUILDDIR)/$(MTD_UTILS) - - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -mtd_get: $(STATEDIR)/mtd.get - -$(STATEDIR)/mtd.get: $(mtd_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - -$(MTD_UTILS_SOURCE): - @$(call targetinfo, $@) - @$(call get, MTD_UTILS) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -mtd_extract: $(STATEDIR)/mtd.extract - -$(STATEDIR)/mtd.extract: $(mtd_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(MTD_UTILS_DIR)) - @$(call extract, MTD_UTILS) - @$(call patchin, MTD_UTILS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -mtd_prepare: $(STATEDIR)/mtd.prepare - -MTD_UTILS_PATH = PATH=$(CROSS_PATH) -MTD_UTILS_MAKEVARS = CROSS=$(COMPILER_PREFIX) -MTD_UTILS_ENV = $(CROSS_ENV) - -$(STATEDIR)/mtd.prepare: $(mtd_prepare_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -mtd_compile: $(STATEDIR)/mtd.compile - -$(STATEDIR)/mtd.compile: $(mtd_compile_deps_default) - @$(call targetinfo, $@) - -ifdef PTXCONF_MTD_FLASH_ERASE - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make flash_erase $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_FLASH_ERASEALL - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make flash_eraseall $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_FLASH_INFO - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make flash_info $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_FLASH_LOCK - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make flash_lock $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_FLASH_UNLOCK - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make flash_unlock $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_FLASHCP - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make flashcp $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_FTL_CHECK - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make ftl_check $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_FTL_FORMAT - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make ftl_format $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_JFFS_DUMP - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make jffs-dump $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_JFFS2_DUMP - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make jffs2dump $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_JFFS2READER - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make jffs2reader $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_MTDDEBUG - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make mtd_debug $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_NANDDUMP - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make nanddump $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_NANDWRITE - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make nandwrite $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_NFTL_FORMAT - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make nftl_format $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_NFTLDUMP - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make nftldump $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_MKJFFS - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make mkfs.jffs $(MTD_UTILS_MAKEVARS) -endif -ifdef PTXCONF_MTD_MKJFFS2 - cd $(MTD_UTILS_DIR) && $(MTD_UTILS_ENV) $(MTD_UTILS_PATH) make mkfs.jffs2 $(MTD_UTILS_MAKEVARS) -endif - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -mtd_install: $(STATEDIR)/mtd.install - -$(STATEDIR)/mtd.install: $(mtd_install_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -mtd_targetinstall: $(STATEDIR)/mtd.targetinstall - -$(STATEDIR)/mtd.targetinstall: $(mtd_targetinstall_deps_default) - @$(call targetinfo, $@) - - @$(call install_init, mtd) - @$(call install_fixup, mtd,PACKAGE,mtd) - @$(call install_fixup, mtd,PRIORITY,optional) - @$(call install_fixup, mtd,VERSION,$(subst -,,$(MTD_UTILS_VERSION))) - @$(call install_fixup, mtd,SECTION,base) - @$(call install_fixup, mtd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - @$(call install_fixup, mtd,DEPENDS,) - @$(call install_fixup, mtd,DESCRIPTION,missing) - -ifdef PTXCONF_MTD_FLASH_ERASE - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/flash_erase, /sbin/flash_erase) -endif -ifdef PTXCONF_MTD_FLASH_ERASEALL - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/flash_eraseall, /sbin/flash_eraseall) -endif -ifdef PTXCONF_MTD_FLASH_INFO - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/flash_info, /sbin/flash_info) -endif -ifdef PTXCONF_MTD_FLASH_LOCK - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/flash_lock, /sbin/flash_lock) -endif -ifdef PTXCONF_MTD_FLASH_UNLOCK - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/flash_unlock, /sbin/flash_unlock) -endif -ifdef PTXCONF_MTD_FLASHCP - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/flashcp, /sbin/flashcp) -endif -ifdef PTXCONF_MTD_FTL_CHECK - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/ftl_check, /sbin/ftl_check) -endif -ifdef PTXCONF_MTD_FTL_FORMAT - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/ftl_format, /sbin/ftl_format) -endif -ifdef PTXCONF_MTD_JFFS_DUMP - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/jffs-dump, /sbin/jffs-dump) -endif -ifdef PTXCONF_MTD_JFFS2_DUMP - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/jffs2dump, /sbin/jffs2dump) -endif -ifdef PTXCONF_MTD_JFFS2READER - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/jffs2reader, /sbin/jffs2reader) -endif -ifdef PTXCONF_MTD_MTDDEBUG - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/mtd_debug, /sbin/mtd_debug) -endif -ifdef PTXCONF_MTD_NANDDUMP - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/nanddump, /sbin/nanddump) -endif -ifdef PTXCONF_MTD_NANDWRITE - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/nandwrite, /sbin/nandwrite) -endif -ifdef PTXCONF_MTD_NFTL_FORMAT - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/nftl_format, /sbin/nftl_format) -endif -ifdef PTXCONF_MTD_NFTLDUMP - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/nftldump, /sbin/nftldump) -endif -ifdef PTXCONF_MTD_MKJFFS - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/mkfs.jffs, /sbin/mkfs.jffs) -endif -ifdef PTXCONF_MTD_MKJFFS2 - @$(call install_copy, mtd, 0, 0, 0755, $(MTD_UTILS_DIR)/mkfs.jffs2, /sbin/mkfs.jffs2) -endif - - @$(call install_finish, mtd) - - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -mtd_clean: - rm -rf $(STATEDIR)/mtd.* - rm -rf $(IMAGEDIR)/mtd_* - rm -rf $(MTD_UTILS_DIR) - -# vim: syntax=make |