erofs-utils: remove redundant EROFS_MKFS_VERSION
PATCH 1/2 erofs-utils: remove redundant EROFS_MKFS_VERSION
Let's use PACKAGE_VERSION exported by autoconf instead. Reset the version to 0.5 since there are still some stuffs to do.
--- configure.ac | 2 +- mkfs/Makefile.am | 2 +- mkfs/erofs_config.c | 3 ++- mkfs/erofs_config.h | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-)
configure.ac +1 -1
@@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([mkfs.erofs], [0.0.1], [bluce.liguifu at huawei.com]) +AC_INIT([mkfs.erofs], [0.1], [bluce.liguifu at huawei.com]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([foreign -Wall -Werror])
mkfs/Makefile.am +1 -1
@@ -21,7 +21,7 @@ noinst_HEADERS = erofs_config.h \ erofs_io.h \ mkfs_file.h -mkfs_erofs_CFLAGS = -Wall -Werror -DEROFS_MKFS_VERSION=\"v1.0\" -I$(top_srcdir)/include +mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include ACLOCAL_AMFLAGS = -I m4 if SUPPORT_LARG_FILE_AT_BIT32
mkfs/erofs_config.c +2 -1
@@ -9,6 +9,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include "config.h" #include "erofs_config.h" #include "erofs_debug.h"
@@ -19,7 +20,7 @@ void mkfs_init_configure(void)memset (&erofs_cfg,0 ,sizeof (erofs_cfg)); erofs_cfg.c_alg_name ="none" ; erofs_cfg.c_dbg_lvl =0 ; - erofs_cfg.c_version =EROFS_MKFS_VERSION " " __DATE__" " __TIME__; + erofs_cfg.c_version =PACKAGE_VERSION " " __DATE__" " __TIME__; }void mkfs_dump_config (void )
mkfs/erofs_config.h +2 -2
@@ -6,8 +6,8 @@* http://www.huawei.com/ * Created by Li Guifu <bluce.liguifu at huawei.com> */ -#ifndef __EROFS_CONFIG_H -#define __EROFS_CONFIG_H +#ifndef __EROFS_MKFS_CONFIG_H +#define __EROFS_MKFS_CONFIG_H/* workaround of a lz4 native compression issue, which can crash the program */ /* #define EROFS_CONFIG_COMPR_MAX_SZ (1024 * 1024) */
Signature · 1 line
2.11.0
PATCH 2/2 erofs-utils: move 'ACLOCAL_AMFLAGS = -I m4' to $(top_srcdir)/Makefile.am
--- Makefile.am | 2 ++ mkfs/Makefile.am | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
Makefile.am +2 -0
@@ -1,3 +1,5 @@ # Makefile.am +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS=mkfs
mkfs/Makefile.am +0 -1
@@ -22,7 +22,6 @@ noinst_HEADERS = erofs_config.h \ mkfs_file.h mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -ACLOCAL_AMFLAGS = -I m4 if SUPPORT_LARG_FILE_AT_BIT32 mkfs_erofs_CFLAGS += -D_FILE_OFFSET_BITS=64
Signature · 1 line
2.11.0
PATCH 2/2 erofs-utils: move 'ACLOCAL_AMFLAGS = -I m4' to $(top_srcdir)/Makefile.am
Quoted 21 lines · Gao Xiang
Signed-off-by Gao Xiang <hsiangkao at aol.com>--- Makefile.am | 2 ++ mkfs/Makefile.am | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)Makefile.am +2
-0@@ -1,3 +1,5 @@ # Makefile.am +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS=mkfsmkfs/Makefile.am +0
-0
mkfs/Makefile.am noinst_HEADERS = erofs_config.h \ · line 27
Quoted 7 lines
mkfs/Makefile.am +0
-1@@ -22,7 +22,6 @@ noinst_HEADERS = erofs_config.h \ mkfs_file.h mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -ACLOCAL_AMFLAGS = -I m4 if SUPPORT_LARG_FILE_AT_BIT32 mkfs_erofs_CFLAGS += -D_FILE_OFFSET_BITS=64
It runs well
Reviewd-by bluce.liguifu at huawei.com
PATCH 2/2 erofs-utils: move 'ACLOCAL_AMFLAGS = -I m4' to $(top_srcdir)/Makefile.am
In reply to Gao XiangQuoted 21 lines · Gao Xiang
Signed-off-by Gao Xiang <hsiangkao at aol.com>--- Makefile.am | 2 ++ mkfs/Makefile.am | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)Makefile.am +2
-0@@ -1,3 +1,5 @@ # Makefile.am +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS=mkfsmkfs/Makefile.am +0
-0
mkfs/Makefile.am noinst_HEADERS = erofs_config.h \ · line 27
Quoted 7 lines
mkfs/Makefile.am +0
-1@@ -22,7 +22,6 @@ noinst_HEADERS = erofs_config.h \ mkfs_file.h mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -ACLOCAL_AMFLAGS = -I m4 if SUPPORT_LARG_FILE_AT_BIT32 mkfs_erofs_CFLAGS += -D_FILE_OFFSET_BITS=64
Thanks,
PATCH 1/2 erofs-utils: remove redundant EROFS_MKFS_VERSION
In reply to Gao XiangQuoted 63 lines · Gao Xiang
Let's use
PACKAGE_VERSIONexported by autoconf instead. Reset the version to 0.5 since there are still some stuffs to do.Signed-off-by Gao Xiang <hsiangkao at aol.com>--- configure.ac | 2 +- mkfs/Makefile.am | 2 +- mkfs/erofs_config.c | 3 ++- mkfs/erofs_config.h | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-)configure.ac +1
-1@@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([mkfs.erofs], [0.0.1], [bluce.liguifu at huawei.com]) +AC_INIT([mkfs.erofs], [0.1], [bluce.liguifu at huawei.com]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([foreign -Wall -Werror])mkfs/Makefile.am +1
-1@@ -21,7 +21,7 @@ noinst_HEADERS = erofs_config.h \ erofs_io.h \ mkfs_file.h -mkfs_erofs_CFLAGS = -Wall -Werror -DEROFS_MKFS_VERSION=\"v1.0\" -I$(top_srcdir)/include +mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include ACLOCAL_AMFLAGS = -I m4 if SUPPORT_LARG_FILE_AT_BIT32mkfs/erofs_config.c +2
-1@@ -9,6 +9,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include "config.h" #include "erofs_config.h" #include "erofs_debug.h" @@ -19,7 +20,7 @@ void mkfs_init_configure(void)memset (&erofs_cfg,0 ,sizeof (erofs_cfg)); erofs_cfg.c_alg_name ="none" ; erofs_cfg.c_dbg_lvl =0 ; - erofs_cfg.c_version =EROFS_MKFS_VERSION " " __DATE__" " __TIME__; + erofs_cfg.c_version =PACKAGE_VERSION " " __DATE__" " __TIME__; }void mkfs_dump_config (void )mkfs/erofs_config.h +0
-0
mkfs/erofs_config.h line 13
Quoted 10 lines
mkfs/erofs_config.h +2
-2@@ -6,8 +6,8 @@* http://www.huawei.com/ * Created by Li Guifu <bluce.liguifu at huawei.com> */ -#ifndef __EROFS_CONFIG_H -#define __EROFS_CONFIG_H +#ifndef __EROFS_MKFS_CONFIG_H +#define __EROFS_MKFS_CONFIG_H/* workaround of a lz4 native compression issue, which can crash the program */ /* #define EROFS_CONFIG_COMPR_MAX_SZ (1024 * 1024) */
It runs well
Reviewd-by bluce.liguifu at huawei.com
PATCH 1/2 erofs-utils: remove redundant EROFS_MKFS_VERSION
In reply to Gao XiangQuoted 63 lines · Gao Xiang
Let's use
PACKAGE_VERSIONexported by autoconf instead. Reset the version to 0.5 since there are still some stuffs to do.Signed-off-by Gao Xiang <hsiangkao at aol.com>--- configure.ac | 2 +- mkfs/Makefile.am | 2 +- mkfs/erofs_config.c | 3 ++- mkfs/erofs_config.h | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-)configure.ac +1
-1@@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([mkfs.erofs], [0.0.1], [bluce.liguifu at huawei.com]) +AC_INIT([mkfs.erofs], [0.1], [bluce.liguifu at huawei.com]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([foreign -Wall -Werror])mkfs/Makefile.am +1
-1@@ -21,7 +21,7 @@ noinst_HEADERS = erofs_config.h \ erofs_io.h \ mkfs_file.h -mkfs_erofs_CFLAGS = -Wall -Werror -DEROFS_MKFS_VERSION=\"v1.0\" -I$(top_srcdir)/include +mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include ACLOCAL_AMFLAGS = -I m4 if SUPPORT_LARG_FILE_AT_BIT32mkfs/erofs_config.c +2
-1@@ -9,6 +9,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include "config.h" #include "erofs_config.h" #include "erofs_debug.h" @@ -19,7 +20,7 @@ void mkfs_init_configure(void)memset (&erofs_cfg,0 ,sizeof (erofs_cfg)); erofs_cfg.c_alg_name ="none" ; erofs_cfg.c_dbg_lvl =0 ; - erofs_cfg.c_version =EROFS_MKFS_VERSION " " __DATE__" " __TIME__; + erofs_cfg.c_version =PACKAGE_VERSION " " __DATE__" " __TIME__; }void mkfs_dump_config (void )mkfs/erofs_config.h +0
-0
mkfs/erofs_config.h line 13
Quoted 10 lines
mkfs/erofs_config.h +2
-2@@ -6,8 +6,8 @@* http://www.huawei.com/ * Created by Li Guifu <bluce.liguifu at huawei.com> */ -#ifndef __EROFS_CONFIG_H -#define __EROFS_CONFIG_H +#ifndef __EROFS_MKFS_CONFIG_H +#define __EROFS_MKFS_CONFIG_H/* workaround of a lz4 native compression issue, which can crash the program */ /* #define EROFS_CONFIG_COMPR_MAX_SZ (1024 * 1024) */
Thanks,