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.schwe...@pengutronix.de>
---
rules/dosfstools.in | 30 +++++++++++++++---------------
rules/dosfstools.make | 43 +++++++++++++------------------------------
rules/host-dosfstools.make | 3 +--
scripts/migrate/migrate_ptx | 18 ++++++++++++++++++
4 files changed, 47 insertions(+), 47 deletions(-)
Changes since v2:
- also update host-dosfstools to use autoconf
Changes since (implicit) v1:
- remove obsolete stages, which are replaced by autotools defaults
diff --git a/rules/dosfstools.in b/rules/dosfstools.in
index c5cedfc66..45e1e88db 100644
--- a/rules/dosfstools.in
+++ b/rules/dosfstools.in
@@ -6,28 +6,28 @@ menuconfig DOSFSTOOLS
if DOSFSTOOLS
-config DOSFSTOOLS_MKDOSFS
+config DOSFSTOOLS_MKFS_FAT
bool
depends on !BUSYBOX_MKFS_VFAT || ALLYES
- prompt "mkdosfs"
+ prompt "mkfs.fat"
help
- mkdosfs - create an MS-DOS file system under Linux
+ mkfs.fat - create an MS-DOS file system under Linux
comment "BusyBox' mkdosfs is selected!"
depends on BUSYBOX_MKFS_VFAT
-config DOSFSTOOLS_MKDOSFS_MSDOS
+config DOSFSTOOLS_MKFS_FAT_MSDOS
bool
depends on !BUSYBOX_MKFS_VFAT || ALLYES
- select DOSFSTOOLS_MKDOSFS
+ select DOSFSTOOLS_MKFS_FAT
prompt "create mkfs.msdos link"
help
FAT 12 / MSDOS Format
-config DOSFSTOOLS_MKDOSFS_VFAT
+config DOSFSTOOLS_MKFS_FAT_VFAT
bool
depends on !BUSYBOX_MKFS_VFAT || ALLYES
- select DOSFSTOOLS_MKDOSFS
+ select DOSFSTOOLS_MKFS_FAT
prompt "create mkfs.vfat link"
help
VFAT Format - Long Filenames, big files, etc.
@@ -35,29 +35,29 @@ config DOSFSTOOLS_MKDOSFS_VFAT
comment "BusyBox' mkfs.vfat is selected!"
depends on BUSYBOX_MKFS_VFAT
-config DOSFSTOOLS_DOSFSCK
+config DOSFSTOOLS_FSCK_FAT
bool
- prompt "dosfsck"
+ prompt "fsck.fat"
help
This is the DOSFS / VFAT Filesystem Checker
-config DOSFSTOOLS_DOSFSCK_MSDOS
+config DOSFSTOOLS_FSCK_FAT_MSDOS
bool
- select DOSFSTOOLS_DOSFSCK
+ select DOSFSTOOLS_FSCK_FAT
prompt "create fsck.msdos link"
help
FAT 12 / MSDOS Format
-config DOSFSTOOLS_DOSFSCK_VFAT
+config DOSFSTOOLS_FSCK_FAT_VFAT
bool
- select DOSFSTOOLS_DOSFSCK
+ select DOSFSTOOLS_FSCK_FAT
prompt "create fsck.vfat link"
help
VFAT Format - Long Filenames, big files, etc.
-config DOSFSTOOLS_DOSFSLABEL
+config DOSFSTOOLS_FATLABEL
bool
- prompt "dosfslabel"
+ prompt "fatlabel"
help
set or get a MS-DOS filesystem label
diff --git a/rules/dosfstools.make b/rules/dosfstools.make
index a7177e609..a1a773777 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,7 @@ 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
# ----------------------------------------------------------------------------
# Target-Install
@@ -63,32 +46,32 @@ $(STATEDIR)/dosfstools.targetinstall:
@$(call install_fixup, dosfstools,AUTHOR,"Steven Scholz
<steven.sch...@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)
diff --git a/rules/host-dosfstools.make b/rules/host-dosfstools.make
index 6ab5fcf5a..fb47cdc60 100644
--- a/rules/host-dosfstools.make
+++ b/rules/host-dosfstools.make
@@ -17,7 +17,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_DOSFSTOOLS) += host-dosfstools
# Prepare
# ----------------------------------------------------------------------------
-HOST_DOSFSTOOLS_CONF_TOOL := NO
-HOST_DOSFSTOOLS_INSTALL_OPT := PREFIX= install
+HOST_DOSFSTOOLS_CONF_TOOL := autoconf
# vim: syntax=make
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index 8f52662cf..ec687f976 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -272,3 +272,21 @@ s/^\(\(# \)\?PTXCONF_\)PYTHON_DJANGO/\1PYTHON3_DJANGO/
s/^\(\(#
\)\?PTXCONF_\)UDEV_\(DEBUG\|SYSLOG\|ETC_CONF\|KEYMAPS\|STARTSCRIPT\|ACCELEROMETER\)\>/\1UDEV_LEGACY_\3/
s/^\(\(#
\)\?PTXCONF_\)UDEV_\(DRIVERS_RULES\|CUST_RULES\|PERSISTENT_.*\|COLLECT\|MTD_PROBE\)\>\(.*\)$/\1UDEV_LEGACY_\3\4\n\1SYSTEMD_UDEV_\3\4/
s/^\(\(# \)\?PTXCONF_\)UDEV_\(HWDB\)\>/\1SYSTEMD_UDEV_\3/
+
+#
+# from : ptxdist-2017.04.0
+# to : ptxdist-2017.05.0
+# symbol : DOSFSTOOLS_MKDOSFS_MSDOS -> DOSFSTOOLS_MKFS_FAT_MSDOS
+# symbol : DOSFSTOOLS_MKDOSFS_VFAT -> DOSFSTOOLS_MKFS_FAT_VFAT
+# symbol : DOSFSTOOLS_MKDOSFS -> DOSFSTOOLS_MKFS_FAT
+# symbol : DOSFSTOOLS_DOSFSCK -> DOSFSTOOLS_FSCK_FAT
+# symbol : DOSFSTOOLS_DOSFSLABEL -> DOSFSTOOLS_FATLABEL
+# reason : new file names in dosfsutils 4.1
+#
+s/^\(\(#
\)\?PTXCONF_\)DOSFSTOOLS_MKDOSFS_MSDOS\(.*\)$/\1DOSFSTOOLS_MKFS_FAT_MSDOS/
+s/^\(\(#
\)\?PTXCONF_\)DOSFSTOOLS_MKDOSFS_VFAT\(.*\)$/\1DOSFSTOOLS_MKFS_FAT_VFAT/
+s/^\(\(# \)\?PTXCONF_\)DOSFSTOOLS_MKDOSFS\(.*\)$/\1DOSFSTOOLS_MKFS_FAT/
+s/^\(\(# \)\?PTXCONF_\)DOSFSTOOLS_DOSFSCK_MSDOS/\1DOSFSTOOLS_FSCK_FAT_MSDOS/
+s/^\(\(# \)\?PTXCONF_\)DOSFSTOOLS_DOSFSCK_VFAT/\1DOSFSTOOLS_FSCK_FAT_VFAT/
+s/^\(\(# \)\?PTXCONF_\)DOSFSTOOLS_DOSFSCK/\1DOSFSTOOLS_FSCK_FAT/
+s/^\(\(# \)\?PTXCONF_\)DOSFSTOOLS_DOSFSLABEL/\1DOSFSTOOLS_FATLABEL/
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
