Re: util-linux breakage with v2.24.2 on Alpha

Tobias Klausmann
2014-06-08T13:16:28Z

Hi!

On Sun, 08 Jun 2014, Ruediger Meier wrote:
> On Sunday 08 June 2014, Tobias Klausmann wrote:
> > Hey,
> >
> > I am one of the Gentoo maintainers for the Alpha arch. As of
> > util-linux 2.24, the build broke reliably:
> >
> > CC libfdisk/src/libfdisk_la-bsd.lo
> > libfdisk/src/bsd.c: In function bsd_translate_fstype:
> > libfdisk/src/bsd.c:790:10: error: BSD_FS_MSDOS undeclared (first use
> > in this function) return BSD_FS_MSDOS;
> > ^
>
> Looks like you have to ignore this case on alpha:
>
> diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
> index a81afd2..df0fc13 100644
> --- a/libfdisk/src/bsd.c
> +++ b/libfdisk/src/bsd.c
> @@ -773,8 +773,10 @@ static int bsd_translate_fstype (int linux_type)
> case 0x06: /* DOS 16-bit >=32M */
> case 0xe1: /* DOS access */
> case 0xe3: /* DOS R/O */
> +#if !defined (__alpha__)
> case 0xf2: /* DOS secondary */
> return BSD_FS_MSDOS;
> +#endif
> case 0x07: /* OS/2 HPFS */
> return BSD_FS_HPFS;
> default

This seems to work when used against
404891fa9ea6a7ca86a838e809fc0b168169c286 aka tag v2.24.2:

$ make -j4 fdisk
[...]
CCLD libcommon.la
CCLD libuuid.la
CCLD libblkid.la
copying selected object files to avoid basename conflicts...
CCLD libfdisk.la
CCLD fdisk
$ sudo ./fdisk -l sda
Password:
Disk /dev/sda: 17 GiB, 18209320960 bytes, 35565080 sectors
Geometry: 64 heads, 32 sectors/track, 17365 cylinders
Units: sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: bsd
partitions: 3

# Start End Size Type fsize bsize cpg
a 4096 1959935 1955840 swap
b 1959936 35563519 33603584 ext2
c 0 35563519 35563520 unused 0 0

I'll get the patch into our distro for now. I presume this will
be picked up for one of the next versions of u-l?

Regards,
Tobias