| Message ID | 1467234876-27902-1-git-send-email-hauke@hauke-m.de |
|---|---|
| State | Changes Requested |
| Headers | show |
On 29/06/2016 23:14, Hauke Mehrtens wrote: > From: Hauke Mehrtens <hauke.mehrtens@intel.com> > > The libmagic shipped with RedHat 5 does not define > MAGIC_NO_CHECK_COMPRESS and MAGIC_NO_CHECK_COMPRESS. e2fsprogs should > check for that otherwise the build will fail. > can you send this upstream aswell please ? John > Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com> > --- > tools/e2fsprogs/patches/010-old-libmagic.patch | 11 +++++++++++ > 1 file changed, 11 insertions(+) > create mode 100644 tools/e2fsprogs/patches/010-old-libmagic.patch > > diff --git a/tools/e2fsprogs/patches/010-old-libmagic.patch b/tools/e2fsprogs/patches/010-old-libmagic.patch > new file mode 100644 > index 0000000..5ba8a54 > --- /dev/null > +++ b/tools/e2fsprogs/patches/010-old-libmagic.patch > @@ -0,0 +1,11 @@ > +--- a/lib/support/plausible.c > ++++ b/lib/support/plausible.c > +@@ -247,7 +247,7 @@ int check_plausibility(const char *devic > + return 0; > + } > + > +-#ifdef HAVE_MAGIC_H > ++#if defined(HAVE_MAGIC_H) && defined(MAGIC_NO_CHECK_COMPRESS) && defined(MAGIC_NO_CHECK_COMPRESS) > + if ((flags & CHECK_FS_EXIST) && > + !getenv("E2FSPROGS_LIBMAGIC_SUPPRESS") && > + magic_library_available()) { >
On 29.06.2016 23:14, Hauke Mehrtens wrote: > From: Hauke Mehrtens <hauke.mehrtens@intel.com> > > The libmagic shipped with RedHat 5 does not define As a reference - RHEL4: Mar/2017, RHEL5:Nov/2020 src: https://access.redhat.com/support/policy/updates/errata I have recommended/tested build OS on my todo list > MAGIC_NO_CHECK_COMPRESS and MAGIC_NO_CHECK_COMPRESS. c/p error ? e2fsprogs should > check for that otherwise the build will fail. > > Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com> > --- > tools/e2fsprogs/patches/010-old-libmagic.patch | 11 +++++++++++ > 1 file changed, 11 insertions(+) > create mode 100644 tools/e2fsprogs/patches/010-old-libmagic.patch > > diff --git a/tools/e2fsprogs/patches/010-old-libmagic.patch b/tools/e2fsprogs/patches/010-old-libmagic.patch > new file mode 100644 > index 0000000..5ba8a54 > --- /dev/null > +++ b/tools/e2fsprogs/patches/010-old-libmagic.patch > @@ -0,0 +1,11 @@ > +--- a/lib/support/plausible.c > ++++ b/lib/support/plausible.c > +@@ -247,7 +247,7 @@ int check_plausibility(const char *devic > + return 0; > + } > + > +-#ifdef HAVE_MAGIC_H > ++#if defined(HAVE_MAGIC_H) && defined(MAGIC_NO_CHECK_COMPRESS) && defined(MAGIC_NO_CHECK_COMPRESS) c/p error ? > + if ((flags & CHECK_FS_EXIST) && > + !getenv("E2FSPROGS_LIBMAGIC_SUPPRESS") && > + magic_library_available()) { >
On 06/30/2016 08:15 AM, Dirk Neukirchen wrote: > On 29.06.2016 23:14, Hauke Mehrtens wrote: >> From: Hauke Mehrtens <hauke.mehrtens@intel.com> >> >> The libmagic shipped with RedHat 5 does not define > > As a reference - RHEL4: Mar/2017, RHEL5:Nov/2020 > src: https://access.redhat.com/support/policy/updates/errata Yes it is very old and we are planing a migration to something more recent, it is already anoint. > I have recommended/tested build OS on my todo list You can not test all this in advance. >> MAGIC_NO_CHECK_COMPRESS and MAGIC_NO_CHECK_COMPRESS. > > c/p error ? Yes, I will fix it. > e2fsprogs should >> check for that otherwise the build will fail. >> >> Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com> >> --- >> tools/e2fsprogs/patches/010-old-libmagic.patch | 11 +++++++++++ >> 1 file changed, 11 insertions(+) >> create mode 100644 tools/e2fsprogs/patches/010-old-libmagic.patch >> >> diff --git a/tools/e2fsprogs/patches/010-old-libmagic.patch b/tools/e2fsprogs/patches/010-old-libmagic.patch >> new file mode 100644 >> index 0000000..5ba8a54 >> --- /dev/null >> +++ b/tools/e2fsprogs/patches/010-old-libmagic.patch >> @@ -0,0 +1,11 @@ >> +--- a/lib/support/plausible.c >> ++++ b/lib/support/plausible.c >> +@@ -247,7 +247,7 @@ int check_plausibility(const char *devic >> + return 0; >> + } >> + >> +-#ifdef HAVE_MAGIC_H >> ++#if defined(HAVE_MAGIC_H) && defined(MAGIC_NO_CHECK_COMPRESS) && defined(MAGIC_NO_CHECK_COMPRESS) > > c/p error ? Yes, I will fix it. >> + if ((flags & CHECK_FS_EXIST) && >> + !getenv("E2FSPROGS_LIBMAGIC_SUPPRESS") && >> + magic_library_available()) { >> >
diff --git a/tools/e2fsprogs/patches/010-old-libmagic.patch b/tools/e2fsprogs/patches/010-old-libmagic.patch new file mode 100644 index 0000000..5ba8a54 --- /dev/null +++ b/tools/e2fsprogs/patches/010-old-libmagic.patch @@ -0,0 +1,11 @@ +--- a/lib/support/plausible.c ++++ b/lib/support/plausible.c +@@ -247,7 +247,7 @@ int check_plausibility(const char *devic + return 0; + } + +-#ifdef HAVE_MAGIC_H ++#if defined(HAVE_MAGIC_H) && defined(MAGIC_NO_CHECK_COMPRESS) && defined(MAGIC_NO_CHECK_COMPRESS) + if ((flags & CHECK_FS_EXIST) && + !getenv("E2FSPROGS_LIBMAGIC_SUPPRESS") && + magic_library_available()) {