On Sun, Jan 30, 2011 at 01:25:22AM +0100, Samuel Thibault wrote:
> --- a/misc-utils/lsblk.c
> +++ b/misc-utils/lsblk.c
> @@ -465,12 +465,14 @@ static int is_readonly_device(struct blkdev_cxt *cxt)
> if (sysfs_scanf(cxt, "ro", "%d", &ro) == 0)
> return ro;
>
> +#ifdef BLKROGET
> /* fallback if "ro" attribute does not exist */
> fd = open(cxt->filename, O_RDONLY);
> if (fd != -1) {
> ioctl(fd, BLKROGET, &ro);
> close(fd);
> }
> +#endif
> return ro;
> }
lsblk makes sense on Linux only, I'll fix misc-utils/Makefile
> diff --git a/shlibs/blkid/src/topology/ioctl.c b/shlibs/blkid/src/topology/ioctl.c
> index 73c18ec..d89aebc 100644
> --- a/shlibs/blkid/src/topology/ioctl.c
> +++ b/shlibs/blkid/src/topology/ioctl.c
> @@ -30,10 +30,18 @@ static struct topology_val {
> int (*set_int)(blkid_probe, int);
>
> } topology_vals[] = {
> +#ifdef BLKALIGNOFF
> { BLKALIGNOFF, NULL, blkid_topology_set_alignment_offset },
> +#endif
> +#ifdef BLKIOMIN
> { BLKIOMIN, blkid_topology_set_minimum_io_size },
> +#endif
> +#ifdef BLKIOOPT
> { BLKIOOPT, blkid_topology_set_optimal_io_size },
> +#endif
> +#ifdef BLKPBSZGET
> { BLKPBSZGET, blkid_topology_set_physical_sector_size }
> +#endif
> /* we read BLKSSZGET in topology.c */
> };
again, makes sense on Linux only. This will be fixed by FreeMiNT patches.
> diff --git a/shlibs/mount/samples/Makefile.am b/shlibs/mount/samples/Makefile.am
> index b0c655f..2710f8b 100644
> --- a/shlibs/mount/samples/Makefile.am
> +++ b/shlibs/mount/samples/Makefile.am
> @@ -3,5 +3,7 @@ include $(top_srcdir)/config/include-Makefile.am
> AM_CPPFLAGS += -I$(ul_libmount_incdir)
> AM_LDFLAGS += $(ul_libmount_la)
>
> +if LINUX
> noinst_PROGRAMS = mount
> +endif
I'll disable whole libmount for non-linux.
Karel
--
Karel Zak <kzak@xxxxxxxxxx>
http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
