[dm-crypt] [PATCH] include sys/sysmacros.h for major/minor/makedev

[dm-crypt] [PATCH] include sys/sysmacros.h for major/minor/makedev

[Mike Frysinger]

These functions are defined in that header, so include it when needed.
Otherwise we can get build failures like:
veritysetup-utils_loop.o: In function '_sysfs_backing_file':
utils_loop.c:(.text+0x50): undefined reference to 'minor'
utils_loop.c:(.text+0x5e): undefined reference to 'major'
veritysetup-utils_loop.o: In function 'crypt_loop_device':
utils_loop.c:(.text+0x638): undefined reference to 'major'
../lib/.libs/libcryptsetup.so: undefined reference to 'makedev'
---
 lib/utils_devpath.c | 1 +
 lib/utils_loop.c    | 1 +
 lib/utils_wipe.c    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/lib/utils_devpath.c b/lib/utils_devpath.c
index 963785a..0bc0563 100644
--- a/lib/utils_devpath.c
+++ b/lib/utils_devpath.c
@@ -30,6 +30,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include "internal.h"
 
diff --git a/lib/utils_loop.c b/lib/utils_loop.c
index ff30a27..b392160 100644
--- a/lib/utils_loop.c
+++ b/lib/utils_loop.c
@@ -27,6 +27,7 @@
 #include <limits.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <linux/loop.h>
 
diff --git a/lib/utils_wipe.c b/lib/utils_wipe.c
index 210c566..8e2a2aa 100644
--- a/lib/utils_wipe.c
+++ b/lib/utils_wipe.c
@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#include <sys/sysmacros.h>
 #include <fcntl.h>
 
 #include "libcryptsetup.h"
-- 
2.7.4

Re: [dm-crypt] [PATCH] include sys/sysmacros.h for major/minor/makedev

[Milan Broz]

On 04/19/2016 08:16 AM, Mike Frysinger wrote:
> These functions are defined in that header, so include it when needed.
> Otherwise we can get build failures like:
> veritysetup-utils_loop.o: In function '_sysfs_backing_file':
> utils_loop.c:(.text+0x50): undefined reference to 'minor'
> utils_loop.c:(.text+0x5e): undefined reference to 'major'
> veritysetup-utils_loop.o: In function 'crypt_loop_device':
> utils_loop.c:(.text+0x638): undefined reference to 'major'
> ../lib/.libs/libcryptsetup.so: undefined reference to 'makedev'
> ---
>  lib/utils_devpath.c | 1 +
>  lib/utils_loop.c    | 1 +
>  lib/utils_wipe.c    | 1 +
>  3 files changed, 3 insertions(+)
> 
> diff --git a/lib/utils_devpath.c b/lib/utils_devpath.c
> index 963785a..0bc0563 100644
> --- a/lib/utils_devpath.c
> +++ b/lib/utils_devpath.c
> @@ -30,6 +30,7 @@
>  #include <errno.h>
>  #include <limits.h>
>  #include <sys/stat.h>
> +#include <sys/sysmacros.h>

Shouldn't we also check for existence of this header in autoconf?
I do not think it is present on all systems (FreeBSD?).

(Basically the same like util-linux is doing now.)

Milan

>  #include <sys/types.h>
>  #include "internal.h"
>  
> diff --git a/lib/utils_loop.c b/lib/utils_loop.c
> index ff30a27..b392160 100644
> --- a/lib/utils_loop.c
> +++ b/lib/utils_loop.c
> @@ -27,6 +27,7 @@
>  #include <limits.h>
>  #include <sys/ioctl.h>
>  #include <sys/stat.h>
> +#include <sys/sysmacros.h>
>  #include <sys/types.h>
>  #include <linux/loop.h>
>  
> diff --git a/lib/utils_wipe.c b/lib/utils_wipe.c
> index 210c566..8e2a2aa 100644
> --- a/lib/utils_wipe.c
> +++ b/lib/utils_wipe.c
> @@ -29,6 +29,7 @@
>  #include <sys/types.h>
>  #include <sys/stat.h>
>  #include <sys/ioctl.h>
> +#include <sys/sysmacros.h>
>  #include <fcntl.h>
>  
>  #include "libcryptsetup.h"
> 

Re: [dm-crypt] [PATCH] include sys/sysmacros.h for major/minor/makedev

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 1522 bytes --]

On 19 Apr 2016 08:34, Milan Broz wrote:
> On 04/19/2016 08:16 AM, Mike Frysinger wrote:
> > These functions are defined in that header, so include it when needed.
> > Otherwise we can get build failures like:
> > veritysetup-utils_loop.o: In function '_sysfs_backing_file':
> > utils_loop.c:(.text+0x50): undefined reference to 'minor'
> > utils_loop.c:(.text+0x5e): undefined reference to 'major'
> > veritysetup-utils_loop.o: In function 'crypt_loop_device':
> > utils_loop.c:(.text+0x638): undefined reference to 'major'
> > ../lib/.libs/libcryptsetup.so: undefined reference to 'makedev'
> > ---
> >  lib/utils_devpath.c | 1 +
> >  lib/utils_loop.c    | 1 +
> >  lib/utils_wipe.c    | 1 +
> >  3 files changed, 3 insertions(+)
> > 
> > diff --git a/lib/utils_devpath.c b/lib/utils_devpath.c
> > index 963785a..0bc0563 100644
> > --- a/lib/utils_devpath.c
> > +++ b/lib/utils_devpath.c
> > @@ -30,6 +30,7 @@
> >  #include <errno.h>
> >  #include <limits.h>
> >  #include <sys/stat.h>
> > +#include <sys/sysmacros.h>
> 
> Shouldn't we also check for existence of this header in autoconf?
> I do not think it is present on all systems (FreeBSD?).

i couldn't tell how portable this code base was trying to be or if it
was assuming Linux.  if you want to be portable w/autoconf, should be
easy to do:
(1) call AC_HEADER_MAJOR in configure.ac
(2) use the idiom:
#ifdef MAJOR_IN_MKDEV
# include <sys/mkdev.h>
#elif defined(MAJOR_IN_SYSMACROS)
# include <sys/sysmacros.h>
#endif
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [dm-crypt] [PATCH] include sys/sysmacros.h for major/minor/makedev

[Milan Broz]

On 04/19/2016 08:53 AM, Mike Frysinger wrote:
> On 19 Apr 2016 08:34, Milan Broz wrote:
>> On 04/19/2016 08:16 AM, Mike Frysinger wrote:
...
>>> +#include <sys/sysmacros.h>
>>
>> Shouldn't we also check for existence of this header in autoconf?
>> I do not think it is present on all systems (FreeBSD?).
> 
> i couldn't tell how portable this code base was trying to be or if it
> was assuming Linux.  if you want to be portable w/autoconf, should be
> easy to do:
> (1) call AC_HEADER_MAJOR in configure.ac
> (2) use the idiom:
> #ifdef MAJOR_IN_MKDEV
> # include <sys/mkdev.h>
> #elif defined(MAJOR_IN_SYSMACROS)
> # include <sys/sysmacros.h>
> #endif

I fixed it with this commit
https://gitlab.com/cryptsetup/cryptsetup/commit/54c4b1656f93997ae5624051c91ea10249e5a823

Thanks,
Milan

Re: [dm-crypt] [PATCH] include sys/sysmacros.h for major/minor/makedev

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 923 bytes --]

On 19 Apr 2016 11:06, Milan Broz wrote:
> On 04/19/2016 08:53 AM, Mike Frysinger wrote:
> > On 19 Apr 2016 08:34, Milan Broz wrote:
> >> On 04/19/2016 08:16 AM, Mike Frysinger wrote:
> ...
> >>> +#include <sys/sysmacros.h>
> >>
> >> Shouldn't we also check for existence of this header in autoconf?
> >> I do not think it is present on all systems (FreeBSD?).
> > 
> > i couldn't tell how portable this code base was trying to be or if it
> > was assuming Linux.  if you want to be portable w/autoconf, should be
> > easy to do:
> > (1) call AC_HEADER_MAJOR in configure.ac
> > (2) use the idiom:
> > #ifdef MAJOR_IN_MKDEV
> > # include <sys/mkdev.h>
> > #elif defined(MAJOR_IN_SYSMACROS)
> > # include <sys/sysmacros.h>
> > #endif
> 
> I fixed it with this commit
> https://gitlab.com/cryptsetup/cryptsetup/commit/54c4b1656f93997ae5624051c91ea10249e5a823

that'll work for us too.  thanks!
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]