* [ptxdist] [PATCH] dosfstools: version bump: 3.0.28 -> 4.1
@ 2017-04-26 21:44 Robert Schwebel
2017-04-27 5:31 ` [ptxdist] [PATCHv2] " Robert Schwebel
0 siblings, 1 reply; 8+ messages in thread
From: Robert Schwebel @ 2017-04-26 21:44 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
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>
---
rules/dosfstools.in | 30 +++++++++++++++---------------
rules/dosfstools.make | 40 ++++++++++++++++++++--------------------
scripts/migrate/migrate_ptx | 18 ++++++++++++++++++
3 files changed, 53 insertions(+), 35 deletions(-)
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..719358f02 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,24 @@ DOSFSTOOLS_LICENSE := GPL-3.0
# Prepare (nothing to be done here)
# ----------------------------------------------------------------------------
-DOSFSTOOLS_CONF_TOOL := NO
+DOSFSTOOLS_CONF_TOOL := autoconf
# ----------------------------------------------------------------------------
# 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
+#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_INSTALL_OPT := \
+# $(DOSFSTOOLS_MAKE_OPT) \
+# install
# ----------------------------------------------------------------------------
# Target-Install
@@ -63,32 +63,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)
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCHv2] dosfstools: version bump: 3.0.28 -> 4.1
2017-04-26 21:44 [ptxdist] [PATCH] dosfstools: version bump: 3.0.28 -> 4.1 Robert Schwebel
@ 2017-04-27 5:31 ` Robert Schwebel
2017-04-27 7:43 ` [ptxdist] [PATCH 1/2] " Robert Schwebel
0 siblings, 1 reply; 8+ messages in thread
From: Robert Schwebel @ 2017-04-27 5:31 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
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>
---
rules/dosfstools.in | 30 +++++++++++++++---------------
rules/dosfstools.make | 43 +++++++++++++------------------------------
scripts/migrate/migrate_ptx | 18 ++++++++++++++++++
3 files changed, 46 insertions(+), 45 deletions(-)
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.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)
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 1/2] dosfstools: version bump: 3.0.28 -> 4.1
2017-04-27 5:31 ` [ptxdist] [PATCHv2] " Robert Schwebel
@ 2017-04-27 7:43 ` Robert Schwebel
2017-04-28 12:38 ` Michael Olbrich
0 siblings, 1 reply; 8+ messages in thread
From: Robert Schwebel @ 2017-04-27 7:43 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
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>
---
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.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)
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/2] dosfstools: version bump: 3.0.28 -> 4.1
2017-04-27 7:43 ` [ptxdist] [PATCH 1/2] " Robert Schwebel
@ 2017-04-28 12:38 ` Michael Olbrich
2017-04-30 9:45 ` [ptxdist] [PATCHv4] " Robert Schwebel
0 siblings, 1 reply; 8+ messages in thread
From: Michael Olbrich @ 2017-04-28 12:38 UTC (permalink / raw)
To: ptxdist
On Thu, Apr 27, 2017 at 09:43:32AM +0200, Robert Schwebel wrote:
> 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>
> ---
> 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
There a several relevant configure options. Please add those.
Michael
>
> # ----------------------------------------------------------------------------
> # Target-Install
> @@ -63,32 +46,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)
> 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
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCHv4] dosfstools: version bump: 3.0.28 -> 4.1
2017-04-28 12:38 ` Michael Olbrich
@ 2017-04-30 9:45 ` Robert Schwebel
2017-05-01 8:00 ` Robert Schwebel
0 siblings, 1 reply; 8+ messages in thread
From: Robert Schwebel @ 2017-04-30 9:45 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
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>
---
rules/dosfstools.in | 38 +++++++++++++++++++++--------------
rules/dosfstools.make | 48 +++++++++++++++++----------------------------
rules/host-dosfstools.make | 3 +--
scripts/migrate/migrate_ptx | 18 +++++++++++++++++
4 files changed, 60 insertions(+), 47 deletions(-)
Changes since (implicit) v3:
- take care of configure options
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..6a254886c 100644
--- a/rules/dosfstools.in
+++ b/rules/dosfstools.in
@@ -3,31 +3,39 @@ menuconfig DOSFSTOOLS
tristate
prompt "dosfstools "
select GCCLIBS_GCC_S
+ select UDEV if DOSFSTOOLS_UDEV
+ select UDEV_LIBUDEV if DOSFSTOOLS_UDEV
if DOSFSTOOLS
-config DOSFSTOOLS_MKDOSFS
+config DOSFSTOOLS_UDEV
+ bool
+ prompt "make use of udev"
+ help
+ make use of udev
+
+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 +43,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..512eb87b2 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)
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCHv4] dosfstools: version bump: 3.0.28 -> 4.1
2017-04-30 9:45 ` [ptxdist] [PATCHv4] " Robert Schwebel
@ 2017-05-01 8:00 ` Robert Schwebel
2017-05-04 15:28 ` Michael Olbrich
0 siblings, 1 reply; 8+ messages in thread
From: Robert Schwebel @ 2017-05-01 8:00 UTC (permalink / raw)
To: ptxdist
On Sun, Apr 30, 2017 at 11:45:27AM +0200, Robert Schwebel wrote:
> -# ----------------------------------------------------------------------------
> -# Install
> -# ----------------------------------------------------------------------------
> -
> -DOSFSTOOLS_INSTALL_OPT := \
> - $(DOSFSTOOLS_MAKE_OPT) \
> - install
> +DOSFSTOOLS_CONF_TOOL := autoconf
> +DOSFSTOOLS_CONF_OPT = \
> + $(CROSS_AUTOCONF_USR) \
> + --disable-compat-symlinks \
One more question: genimage defaults to mkdosfs, but can be overwritten
in the config or commandline. Shall we continue to provide this name?
rsc
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCHv4] dosfstools: version bump: 3.0.28 -> 4.1
2017-05-01 8:00 ` Robert Schwebel
@ 2017-05-04 15:28 ` Michael Olbrich
2017-05-07 8:17 ` [ptxdist] [PATCHv5] " Robert Schwebel
0 siblings, 1 reply; 8+ messages in thread
From: Michael Olbrich @ 2017-05-04 15:28 UTC (permalink / raw)
To: ptxdist
On Mon, May 01, 2017 at 10:00:01AM +0200, Robert Schwebel wrote:
> On Sun, Apr 30, 2017 at 11:45:27AM +0200, Robert Schwebel wrote:
> > -# ----------------------------------------------------------------------------
> > -# Install
> > -# ----------------------------------------------------------------------------
> > -
> > -DOSFSTOOLS_INSTALL_OPT := \
> > - $(DOSFSTOOLS_MAKE_OPT) \
> > - install
> > +DOSFSTOOLS_CONF_TOOL := autoconf
> > +DOSFSTOOLS_CONF_OPT = \
> > + $(CROSS_AUTOCONF_USR) \
> > + --disable-compat-symlinks \
>
> One more question: genimage defaults to mkdosfs, but can be overwritten
> in the config or commandline. Shall we continue to provide this name?
That would be best. There is no common name for the old and new versions,
so we can't realy 'fix' genimage. And making sure, this is set everywhere
is a pain.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCHv5] dosfstools: version bump: 3.0.28 -> 4.1
2017-05-04 15:28 ` Michael Olbrich
@ 2017-05-07 8:17 ` Robert Schwebel
0 siblings, 0 replies; 8+ messages in thread
From: Robert Schwebel @ 2017-05-07 8:17 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
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>
---
rules/dosfstools.in | 38 +++++++++++++++++++++--------------
rules/dosfstools.make | 48 +++++++++++++++++----------------------------
rules/host-dosfstools.make | 14 +++++++++++--
scripts/migrate/migrate_ptx | 18 +++++++++++++++++
4 files changed, 71 insertions(+), 47 deletions(-)
Changes since v4:
- add 'mkdosfs' link to satisfy 'genimage'
Changes since (implicit) v3:
- take care of configure options
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..6a254886c 100644
--- a/rules/dosfstools.in
+++ b/rules/dosfstools.in
@@ -3,31 +3,39 @@ menuconfig DOSFSTOOLS
tristate
prompt "dosfstools "
select GCCLIBS_GCC_S
+ select UDEV if DOSFSTOOLS_UDEV
+ select UDEV_LIBUDEV if DOSFSTOOLS_UDEV
if DOSFSTOOLS
-config DOSFSTOOLS_MKDOSFS
+config DOSFSTOOLS_UDEV
+ bool
+ prompt "make use of udev"
+ help
+ make use of udev
+
+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 +43,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..512eb87b2 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)
diff --git a/rules/host-dosfstools.make b/rules/host-dosfstools.make
index 6ab5fcf5a..140a2c961 100644
--- a/rules/host-dosfstools.make
+++ b/rules/host-dosfstools.make
@@ -17,7 +17,17 @@ HOST_PACKAGES-$(PTXCONF_HOST_DOSFSTOOLS) += host-dosfstools
# Prepare
# ----------------------------------------------------------------------------
-HOST_DOSFSTOOLS_CONF_TOOL := NO
-HOST_DOSFSTOOLS_INSTALL_OPT := PREFIX= install
+HOST_DOSFSTOOLS_CONF_TOOL := autoconf
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-dosfstools.install:
+ @$(call targetinfo)
+ @$(call world/install, HOST_DOSFSTOOLS)
+# # provide old 'mkdosfs' name, as genimage uses it
+ @ln -s mkfs.fat $(HOST_DOSFSTOOLS_PKGDIR)/sbin/mkdosfs
+ @$(call touch)
# 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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-05-07 8:17 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-26 21:44 [ptxdist] [PATCH] dosfstools: version bump: 3.0.28 -> 4.1 Robert Schwebel
2017-04-27 5:31 ` [ptxdist] [PATCHv2] " Robert Schwebel
2017-04-27 7:43 ` [ptxdist] [PATCH 1/2] " Robert Schwebel
2017-04-28 12:38 ` Michael Olbrich
2017-04-30 9:45 ` [ptxdist] [PATCHv4] " Robert Schwebel
2017-05-01 8:00 ` Robert Schwebel
2017-05-04 15:28 ` Michael Olbrich
2017-05-07 8:17 ` [ptxdist] [PATCHv5] " Robert Schwebel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox