diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2017-05-07 10:17:26 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-05-09 17:29:03 +0200 |
| commit | 5b756c334beb2ebd5295f7b07d2a86b045e6afcd (patch) | |
| tree | 5b9e317e89d3be61312502d3c0defbf014cba0e7 /rules/dosfstools.make | |
| parent | d671ce326a67a0548dc629002c7a5257f4ce4ebb (diff) | |
| download | ptxdist-5b756c334beb2ebd5295f7b07d2a86b045e6afcd.tar.gz ptxdist-5b756c334beb2ebd5295f7b07d2a86b045e6afcd.tar.xz | |
dosfstools: version bump: 3.0.28 -> 4.1
Some file names have changed, adapt to new names. The labels are adapted
as well, so add migration helpers.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
[mol: create legacy linsk with configure options for host-dosfstools]
[mol: fix migrate patterns]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/dosfstools.make')
| -rw-r--r-- | rules/dosfstools.make | 48 |
1 files changed, 18 insertions, 30 deletions
diff --git a/rules/dosfstools.make b/rules/dosfstools.make index a7177e609..be65bdaa3 100644 --- a/rules/dosfstools.make +++ b/rules/dosfstools.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_DOSFSTOOLS) += dosfstools # # Paths and names # -DOSFSTOOLS_VERSION := 3.0.28 -DOSFSTOOLS_MD5 := 6a047a6c65186b9ebb1853709adb36db +DOSFSTOOLS_VERSION := 4.1 +DOSFSTOOLS_MD5 := 07a1050db1a898e9a2e03b0c4569c4bd DOSFSTOOLS := dosfstools-$(DOSFSTOOLS_VERSION) DOSFSTOOLS_SUFFIX := tar.xz DOSFSTOOLS_SRC := $(DOSFSTOOLS).$(DOSFSTOOLS_SUFFIX) @@ -31,24 +31,12 @@ DOSFSTOOLS_LICENSE := GPL-3.0 # Prepare (nothing to be done here) # ---------------------------------------------------------------------------- -DOSFSTOOLS_CONF_TOOL := NO - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -DOSFSTOOLS_MAKE_ENV := $(CROSS_ENV) -DOSFSTOOLS_MAKE_OPT := \ - OPTFLAGS='-O2 -fomit-frame-pointer $(call ptx/ifdef, PTXCONF_GLOBAL_LARGE_FILE,-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64)' \ - PREFIX=/usr - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -DOSFSTOOLS_INSTALL_OPT := \ - $(DOSFSTOOLS_MAKE_OPT) \ - install +DOSFSTOOLS_CONF_TOOL := autoconf +DOSFSTOOLS_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-compat-symlinks \ + --$(call ptx/wwo, PTXCONF_DOSFSTOOLS_UDEV)-udev \ + $(GLOBAL_LARGE_FILE_OPTION) # ---------------------------------------------------------------------------- # Target-Install @@ -63,32 +51,32 @@ $(STATEDIR)/dosfstools.targetinstall: @$(call install_fixup, dosfstools,AUTHOR,"Steven Scholz <steven.scholz@imc-berlin.de>") @$(call install_fixup, dosfstools,DESCRIPTION,missing) -ifdef PTXCONF_DOSFSTOOLS_MKDOSFS +ifdef PTXCONF_DOSFSTOOLS_MKFS_FAT @$(call install_copy, dosfstools, 0, 0, 0755, -, \ - /usr/sbin/mkdosfs) + /usr/sbin/mkfs.fat) endif ifdef PTXCONF_DOSFSTOOLS_MKDOSFS_MSDOS - @$(call install_link, dosfstools, mkdosfs, /usr/sbin/mkfs.msdos) + @$(call install_link, dosfstools, mkfs.fat, /usr/sbin/mkfs.msdos) endif ifdef PTXCONF_DOSFSTOOLS_MKDOSFS_VFAT - @$(call install_link, dosfstools, mkdosfs, /usr/sbin/mkfs.vfat) + @$(call install_link, dosfstools, mkfs.fat, /usr/sbin/mkfs.vfat) endif -ifdef PTXCONF_DOSFSTOOLS_DOSFSCK +ifdef PTXCONF_DOSFSTOOLS_FSCK_FAT @$(call install_copy, dosfstools, 0, 0, 0755, -, \ - /usr/sbin/dosfsck) + /usr/sbin/fsck.fat) endif ifdef PTXCONF_DOSFSTOOLS_DOSFSCK_MSDOS - @$(call install_link, dosfstools, dosfsck, /usr/sbin/fsck.msdos) + @$(call install_link, dosfstools, fsck.fat, /usr/sbin/fsck.msdos) endif ifdef PTXCONF_DOSFSTOOLS_DOSFSCK_VFAT - @$(call install_link, dosfstools, dosfsck, /usr/sbin/fsck.vfat) + @$(call install_link, dosfstools, fsck.fat, /usr/sbin/fsck.vfat) endif -ifdef PTXCONF_DOSFSTOOLS_DOSFSLABEL +ifdef PTXCONF_DOSFSTOOLS_FATLABEL @$(call install_copy, dosfstools, 0, 0, 0755, -, \ - /usr/sbin/dosfslabel) + /usr/sbin/fatlabel) endif @$(call install_finish, dosfstools) |