diff --git a/debian/control b/debian/control index 555b53c..bb1da3c 100644 --- a/debian/control +++ b/debian/control @@ -149,7 +149,7 @@ Description: block device id library - headers and static libraries This package contains the development environment for the blkid library. Package: libmount1 -Architecture: linux-any +Architecture: any Section: libs Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} diff --git a/debian/libmount1.symbols b/debian/libmount1.symbols index 2fee75a..1f30dc7 100644 --- a/debian/libmount1.symbols +++ b/debian/libmount1.symbols @@ -10,94 +10,94 @@ libmount.so.1 libmount1 #MINVER# mnt_cache_find_tag_value@MOUNT_2.19 2.19.1 mnt_cache_read_tags@MOUNT_2.19 2.19.1 mnt_cache_set_targets@MOUNT_2.25 2.25 - mnt_context_append_options@MOUNT_2.19 2.19.1 - mnt_context_apply_fstab@MOUNT_2.19 2.19.1 - mnt_context_disable_canonicalize@MOUNT_2.19 2.19.1 - mnt_context_disable_helpers@MOUNT_2.19 2.19.1 - mnt_context_disable_mtab@MOUNT_2.19 2.19.1 - mnt_context_disable_swapmatch@MOUNT_2.22 2.24.2 - mnt_context_do_mount@MOUNT_2.19 2.19.1 - mnt_context_do_umount@MOUNT_2.19 2.19.1 - mnt_context_enable_fake@MOUNT_2.19 2.19.1 - mnt_context_enable_force@MOUNT_2.19 2.19.1 - mnt_context_enable_fork@MOUNT_2.21 2.24.2 - mnt_context_enable_lazy@MOUNT_2.19 2.19.1 - mnt_context_enable_loopdel@MOUNT_2.19 2.19.1 - mnt_context_enable_rdonly_umount@MOUNT_2.19 2.19.1 - mnt_context_enable_sloppy@MOUNT_2.19 2.19.1 - mnt_context_enable_verbose@MOUNT_2.19 2.19.1 - mnt_context_finalize_mount@MOUNT_2.19 2.19.1 - mnt_context_finalize_umount@MOUNT_2.19 2.19.1 - mnt_context_find_umount_fs@MOUNT_2.23 2.24.2 - mnt_context_get_cache@MOUNT_2.19 2.19.1 - mnt_context_get_fs@MOUNT_2.19 2.19.1 - mnt_context_get_fs_userdata@MOUNT_2.24 2.24.2 - mnt_context_get_fstab@MOUNT_2.19 2.19.1 - mnt_context_get_fstab_userdata@MOUNT_2.24 2.24.2 - mnt_context_get_fstype@MOUNT_2.19 2.19.1 - mnt_context_get_helper_status@MOUNT_2.21 2.24.2 - mnt_context_get_lock@MOUNT_2.19 2.19.1 - mnt_context_get_mflags@MOUNT_2.19 2.19.1 - mnt_context_get_mtab@MOUNT_2.19 2.19.1 - mnt_context_get_mtab_userdata@MOUNT_2.24 2.24.2 - mnt_context_get_options@MOUNT_2.22 2.24.2 - mnt_context_get_optsmode@MOUNT_2.19 2.19.1 - mnt_context_get_source@MOUNT_2.19 2.19.1 - mnt_context_get_status@MOUNT_2.19 2.19.1 - mnt_context_get_syscall_errno@MOUNT_2.21 2.24.2 - mnt_context_get_table@MOUNT_2.20 2.20.1 - mnt_context_get_target@MOUNT_2.19 2.19.1 - mnt_context_get_user_mflags@MOUNT_2.19 2.19.1 - mnt_context_helper_executed@MOUNT_2.21 2.24.2 - mnt_context_helper_setopt@MOUNT_2.19 2.19.1 - mnt_context_init_helper@MOUNT_2.19 2.19.1 - mnt_context_is_child@MOUNT_2.21 2.24.2 - mnt_context_is_fake@MOUNT_2.19 2.19.1 - mnt_context_is_force@MOUNT_2.19 2.19.1 - mnt_context_is_fork@MOUNT_2.21 2.24.2 - mnt_context_is_fs_mounted@MOUNT_2.20 2.20.1 - mnt_context_is_lazy@MOUNT_2.19 2.19.1 - mnt_context_is_loopdel@MOUNT_2.22 2.24.2 - mnt_context_is_nocanonicalize@MOUNT_2.22 2.24.2 - mnt_context_is_nohelpers@MOUNT_2.22 2.24.2 - mnt_context_is_nomtab@MOUNT_2.19 2.19.1 - mnt_context_is_parent@MOUNT_2.21 2.24.2 - mnt_context_is_rdonly_umount@MOUNT_2.19 2.19.1 - mnt_context_is_restricted@MOUNT_2.19 2.19.1 - mnt_context_is_sloppy@MOUNT_2.19 2.19.1 - mnt_context_is_swapmatch@MOUNT_2.22 2.24.2 - mnt_context_is_verbose@MOUNT_2.19 2.19.1 - mnt_context_mount@MOUNT_2.19 2.19.1 - mnt_context_next_mount@MOUNT_2.20 2.20.1 - mnt_context_next_umount@MOUNT_2.21 2.24.2 - mnt_context_prepare_mount@MOUNT_2.19 2.19.1 - mnt_context_prepare_umount@MOUNT_2.19 2.19.1 - mnt_context_reset_status@MOUNT_2.21 2.24.2 - mnt_context_set_cache@MOUNT_2.19 2.19.1 - mnt_context_set_fs@MOUNT_2.19 2.19.1 - mnt_context_set_fstab@MOUNT_2.19 2.19.1 - mnt_context_set_fstype@MOUNT_2.19 2.19.1 - mnt_context_set_fstype_pattern@MOUNT_2.19 2.19.1 - mnt_context_set_mflags@MOUNT_2.19 2.19.1 - mnt_context_set_mountdata@MOUNT_2.19 2.19.1 - mnt_context_set_options@MOUNT_2.19 2.19.1 - mnt_context_set_options_pattern@MOUNT_2.19 2.19.1 - mnt_context_set_optsmode@MOUNT_2.19 2.19.1 - mnt_context_set_passwd_cb@MOUNT_2.21 2.24.2 - mnt_context_set_source@MOUNT_2.19 2.19.1 - mnt_context_set_syscall_status@MOUNT_2.19 2.19.1 - mnt_context_set_tables_errcb@MOUNT_2.20 2.20.1 - mnt_context_set_target@MOUNT_2.19 2.19.1 - mnt_context_set_user_mflags@MOUNT_2.19 2.19.1 - mnt_context_strerror@MOUNT_2.19 2.19.1 - mnt_context_syscall_called@MOUNT_2.21 2.24.2 - mnt_context_tab_applied@MOUNT_2.22 2.24.2 - mnt_context_umount@MOUNT_2.19 2.19.1 - mnt_context_wait_for_children@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_append_options@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_apply_fstab@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_disable_canonicalize@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_disable_helpers@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_disable_mtab@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_disable_swapmatch@MOUNT_2.22 2.24.2 + (arch=linux-any)mnt_context_do_mount@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_do_umount@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_enable_fake@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_enable_force@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_enable_fork@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_enable_lazy@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_enable_loopdel@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_enable_rdonly_umount@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_enable_sloppy@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_enable_verbose@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_finalize_mount@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_finalize_umount@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_find_umount_fs@MOUNT_2.23 2.24.2 + (arch=linux-any)mnt_context_get_cache@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_get_fs@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_get_fs_userdata@MOUNT_2.24 2.24.2 + (arch=linux-any)mnt_context_get_fstab@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_get_fstab_userdata@MOUNT_2.24 2.24.2 + (arch=linux-any)mnt_context_get_fstype@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_get_helper_status@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_get_lock@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_get_mflags@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_get_mtab@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_get_mtab_userdata@MOUNT_2.24 2.24.2 + (arch=linux-any)mnt_context_get_options@MOUNT_2.22 2.24.2 + (arch=linux-any)mnt_context_get_optsmode@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_get_source@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_get_status@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_get_syscall_errno@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_get_table@MOUNT_2.20 2.20.1 + (arch=linux-any)mnt_context_get_target@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_get_user_mflags@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_helper_executed@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_helper_setopt@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_init_helper@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_is_child@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_is_fake@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_is_force@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_is_fork@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_is_fs_mounted@MOUNT_2.20 2.20.1 + (arch=linux-any)mnt_context_is_lazy@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_is_loopdel@MOUNT_2.22 2.24.2 + (arch=linux-any)mnt_context_is_nocanonicalize@MOUNT_2.22 2.24.2 + (arch=linux-any)mnt_context_is_nohelpers@MOUNT_2.22 2.24.2 + (arch=linux-any)mnt_context_is_nomtab@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_is_parent@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_is_rdonly_umount@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_is_restricted@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_is_sloppy@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_is_swapmatch@MOUNT_2.22 2.24.2 + (arch=linux-any)mnt_context_is_verbose@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_mount@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_next_mount@MOUNT_2.20 2.20.1 + (arch=linux-any)mnt_context_next_umount@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_prepare_mount@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_prepare_umount@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_reset_status@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_set_cache@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_fs@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_fstab@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_fstype@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_fstype_pattern@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_mflags@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_mountdata@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_options@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_options_pattern@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_optsmode@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_passwd_cb@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_set_source@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_syscall_status@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_tables_errcb@MOUNT_2.20 2.20.1 + (arch=linux-any)mnt_context_set_target@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_set_user_mflags@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_strerror@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_syscall_called@MOUNT_2.21 2.24.2 + (arch=linux-any)mnt_context_tab_applied@MOUNT_2.22 2.24.2 + (arch=linux-any)mnt_context_umount@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_wait_for_children@MOUNT_2.21 2.24.2 mnt_copy_fs@MOUNT_2.19 2.19.1 mnt_diff_tables@MOUNT_2.20 2.20.1 mnt_free_cache@MOUNT_2.19 2.19.1 - mnt_free_context@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_free_context@MOUNT_2.19 2.19.1 mnt_free_fs@MOUNT_2.19 2.19.1 mnt_free_iter@MOUNT_2.19 2.19.1 mnt_free_lock@MOUNT_2.19 2.19.1 @@ -181,7 +181,7 @@ libmount.so.1 libmount1 #MINVER# mnt_match_fstype@MOUNT_2.19 2.19.1 mnt_match_options@MOUNT_2.19 2.19.1 mnt_new_cache@MOUNT_2.19 2.19.1 - mnt_new_context@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_new_context@MOUNT_2.19 2.19.1 mnt_new_fs@MOUNT_2.19 2.19.1 mnt_new_iter@MOUNT_2.19 2.19.1 mnt_new_lock@MOUNT_2.19 2.19.1 @@ -205,7 +205,7 @@ libmount.so.1 libmount1 #MINVER# mnt_ref_cache@MOUNT_2.24 2.24.2 mnt_ref_fs@MOUNT_2.24 2.24.2 mnt_ref_table@MOUNT_2.24 2.24.2 - mnt_reset_context@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_reset_context@MOUNT_2.19 2.19.1 mnt_reset_fs@MOUNT_2.19 2.19.1 mnt_reset_iter@MOUNT_2.19 2.19.1 mnt_reset_table@MOUNT_2.20 2.20.1 diff --git a/debian/patches/series b/debian/patches/series index da3b6ce..b41b032 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,6 @@ verbose-tests.patch tests-allow-non-inotify-tailf-to-keep-up.patch fdisk-fix-l-device.patch cfdisk-reenable-cursor-when-quitting.patch +0001-libmount-only-invoke-loopcxt-on-linux.patch +0002-libmount-only-include-context-on-linux.patch +0003-build-sys-build-libmount-everywhere.patch diff --git a/debian/util-linux.install b/debian/util-linux.install index 9bb170a..92b0988 100644 --- a/debian/util-linux.install +++ b/debian/util-linux.install @@ -8,7 +8,7 @@ sbin/blkid sbin/cfdisk sbin/fdisk sbin/findfs -#sbin/fsck +sbin/fsck sbin/fsck.cramfs sbin/fsck.minix sbin/hwclock diff --git a/debian/util-linux.install.linux-only b/debian/util-linux.install.linux-only index 0bf8fdb..46dd889 100644 --- a/debian/util-linux.install.linux-only +++ b/debian/util-linux.install.linux-only @@ -5,7 +5,7 @@ sbin/blkdiscard sbin/blockdev sbin/chcpu sbin/ctrlaltdel -sbin/fsck +#sbin/fsck sbin/fsfreeze sbin/fstrim sbin/pivot_root