From: Arne Fitzenreiter Date: Tue, 11 Jul 2017 15:44:42 +0000 (+0200) Subject: Merge branch 'next' into kernel-4.9 X-Git-Tag: v2.21-core122~178^2~124 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=212820f64414c18116b8aeaef75e9027b4de92a7;hp=11ec6473ce30a661018121bd4ddb6e03e43c290e Merge branch 'next' into kernel-4.9 --- diff --git a/config/rootfiles/common/armv5tel/util-linux b/config/rootfiles/common/armv5tel/util-linux index 2675dd0a8f..8b209e5e44 100644 --- a/config/rootfiles/common/armv5tel/util-linux +++ b/config/rootfiles/common/armv5tel/util-linux @@ -8,8 +8,12 @@ bin/wdctl #etc/fcron.daily etc/fcron.daily/trim lib/libblkid.so.1.1.0 +lib/libfdisk.so.1 +lib/libfdisk.so.1.1.0 lib/libmount.so.1 lib/libmount.so.1.1.0 +lib/libsmartcols.so.1 +lib/libsmartcols.so.1.1.0 lib/libuuid.so.1.3.0 sbin/agetty sbin/blkdiscard @@ -29,7 +33,6 @@ sbin/mkfs #sbin/mkfs.cramfs sbin/mkfs.minix sbin/mkswap -sbin/nologin #sbin/pivot_root sbin/raw sbin/sfdisk @@ -38,13 +41,13 @@ sbin/swapoff sbin/swapon sbin/switch_root sbin/wipefs +sbin/zramctl #usr/bin/cal #usr/bin/chrt #usr/bin/col #usr/bin/colcrt #usr/bin/colrm #usr/bin/column -#usr/bin/cytune usr/bin/eject usr/bin/fallocate usr/bin/flock @@ -60,7 +63,10 @@ usr/bin/ionice usr/bin/logger #usr/bin/look usr/bin/lscpu +usr/bin/lsipc usr/bin/lslocks +usr/bin/lslogins +usr/bin/lsns #usr/bin/mcookie #usr/bin/namei usr/bin/nsenter @@ -77,16 +83,26 @@ usr/bin/setsid usr/bin/tailf #usr/bin/taskset #usr/bin/ul +#usr/bin/uname26 #usr/bin/unshare #usr/bin/whereis +#usr/include/libfdisk +#usr/include/libfdisk/libfdisk.h #usr/include/libmount #usr/include/libmount/libmount.h +#usr/include/libsmartcols +#usr/include/libsmartcols/libsmartcols.h #usr/lib/libblkid.la -#usr/lib/libmount.a +#usr/lib/libfdisk.la +#usr/lib/libfdisk.so #usr/lib/libmount.la usr/lib/libmount.so +#usr/lib/libsmartcols.la +#usr/lib/libsmartcols.so #usr/lib/libuuid.la +#usr/lib/pkgconfig/fdisk.pc #usr/lib/pkgconfig/mount.pc +#usr/lib/pkgconfig/smartcols.pc usr/sbin/addpart usr/sbin/delpart usr/sbin/fdformat @@ -95,8 +111,6 @@ usr/sbin/partx #usr/sbin/readprofile usr/sbin/resizepart usr/sbin/rtcwake -#usr/share/bash-completion -#usr/share/bash-completion/completions #usr/share/bash-completion/completions/addpart #usr/share/bash-completion/completions/blkdiscard #usr/share/bash-completion/completions/blkid @@ -110,7 +124,6 @@ usr/sbin/rtcwake #usr/share/bash-completion/completions/colrm #usr/share/bash-completion/completions/column #usr/share/bash-completion/completions/ctrlaltdel -#usr/share/bash-completion/completions/cytune #usr/share/bash-completion/completions/delpart #usr/share/bash-completion/completions/dmesg #usr/share/bash-completion/completions/eject @@ -128,16 +141,21 @@ usr/sbin/rtcwake #usr/share/bash-completion/completions/hexdump #usr/share/bash-completion/completions/hwclock #usr/share/bash-completion/completions/ionice +#usr/share/bash-completion/completions/ipcmk #usr/share/bash-completion/completions/ipcrm #usr/share/bash-completion/completions/ipcs #usr/share/bash-completion/completions/isosize +#usr/share/bash-completion/completions/last #usr/share/bash-completion/completions/ldattach #usr/share/bash-completion/completions/logger #usr/share/bash-completion/completions/look #usr/share/bash-completion/completions/losetup #usr/share/bash-completion/completions/lsblk #usr/share/bash-completion/completions/lscpu +#usr/share/bash-completion/completions/lsipc #usr/share/bash-completion/completions/lslocks +#usr/share/bash-completion/completions/lslogins +#usr/share/bash-completion/completions/lsns #usr/share/bash-completion/completions/mcookie #usr/share/bash-completion/completions/mesg #usr/share/bash-completion/completions/mkfs @@ -146,6 +164,7 @@ usr/sbin/rtcwake #usr/share/bash-completion/completions/mkfs.minix #usr/share/bash-completion/completions/mkswap #usr/share/bash-completion/completions/more +#usr/share/bash-completion/completions/mount #usr/share/bash-completion/completions/mountpoint #usr/share/bash-completion/completions/namei #usr/share/bash-completion/completions/nsenter @@ -167,10 +186,12 @@ usr/sbin/rtcwake #usr/share/bash-completion/completions/setterm #usr/share/bash-completion/completions/sfdisk #usr/share/bash-completion/completions/swaplabel +#usr/share/bash-completion/completions/swapoff #usr/share/bash-completion/completions/swapon #usr/share/bash-completion/completions/tailf #usr/share/bash-completion/completions/taskset #usr/share/bash-completion/completions/ul +#usr/share/bash-completion/completions/umount #usr/share/bash-completion/completions/unshare #usr/share/bash-completion/completions/utmpdump #usr/share/bash-completion/completions/uuidd @@ -179,44 +200,11 @@ usr/sbin/rtcwake #usr/share/bash-completion/completions/wdctl #usr/share/bash-completion/completions/whereis #usr/share/bash-completion/completions/wipefs +#usr/share/bash-completion/completions/zramctl #usr/share/doc/util-linux #usr/share/doc/util-linux/getopt #usr/share/doc/util-linux/getopt/getopt-parse.bash #usr/share/doc/util-linux/getopt/getopt-parse.tcsh -#usr/share/locale/ca/LC_MESSAGES/util-linux.mo -#usr/share/locale/cs/LC_MESSAGES/util-linux.mo -#usr/share/locale/da/LC_MESSAGES/util-linux.mo -#usr/share/locale/de/LC_MESSAGES/util-linux.mo -#usr/share/locale/es/LC_MESSAGES/util-linux.mo -#usr/share/locale/et -#usr/share/locale/et/LC_MESSAGES -#usr/share/locale/et/LC_MESSAGES/util-linux.mo -#usr/share/locale/eu -#usr/share/locale/eu/LC_MESSAGES -#usr/share/locale/eu/LC_MESSAGES/util-linux.mo -#usr/share/locale/fi/LC_MESSAGES/util-linux.mo -#usr/share/locale/fr/LC_MESSAGES/util-linux.mo -#usr/share/locale/gl/LC_MESSAGES/util-linux.mo -#usr/share/locale/hr/LC_MESSAGES/util-linux.mo -#usr/share/locale/hu/LC_MESSAGES/util-linux.mo -#usr/share/locale/id/LC_MESSAGES/util-linux.mo -#usr/share/locale/it/LC_MESSAGES/util-linux.mo -#usr/share/locale/ja/LC_MESSAGES/util-linux.mo -#usr/share/locale/nl/LC_MESSAGES/util-linux.mo -#usr/share/locale/pl/LC_MESSAGES/util-linux.mo -#usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo -#usr/share/locale/ru/LC_MESSAGES/util-linux.mo -#usr/share/locale/sl -#usr/share/locale/sl/LC_MESSAGES -#usr/share/locale/sl/LC_MESSAGES/util-linux.mo -#usr/share/locale/sv/LC_MESSAGES/util-linux.mo -#usr/share/locale/tr/LC_MESSAGES/util-linux.mo -#usr/share/locale/uk -#usr/share/locale/uk/LC_MESSAGES -#usr/share/locale/uk/LC_MESSAGES/util-linux.mo -#usr/share/locale/vi/LC_MESSAGES/util-linux.mo -#usr/share/locale/zh_CN/LC_MESSAGES/util-linux.mo -#usr/share/locale/zh_TW/LC_MESSAGES/util-linux.mo #usr/share/man/man1/cal.1 #usr/share/man/man1/chrt.1 #usr/share/man/man1/col.1 @@ -236,6 +224,8 @@ usr/sbin/rtcwake #usr/share/man/man1/logger.1 #usr/share/man/man1/look.1 #usr/share/man/man1/lscpu.1 +#usr/share/man/man1/lsipc.1 +#usr/share/man/man1/lslogins.1 #usr/share/man/man1/mcookie.1 #usr/share/man/man1/more.1 #usr/share/man/man1/namei.1 @@ -256,6 +246,7 @@ usr/sbin/rtcwake #usr/share/man/man1/whereis.1 #usr/share/man/man3/uuid_generate_time_safe.3 #usr/share/man/man5/fstab.5 +#usr/share/man/man5/terminal-colors.d.5 #usr/share/man/man8/addpart.8 #usr/share/man/man8/agetty.8 #usr/share/man/man8/blkdiscard.8 @@ -263,7 +254,6 @@ usr/sbin/rtcwake #usr/share/man/man8/cfdisk.8 #usr/share/man/man8/chcpu.8 #usr/share/man/man8/ctrlaltdel.8 -#usr/share/man/man8/cytune.8 #usr/share/man/man8/delpart.8 #usr/share/man/man8/fdformat.8 #usr/share/man/man8/fdisk.8 @@ -280,13 +270,13 @@ usr/sbin/rtcwake #usr/share/man/man8/losetup.8 #usr/share/man/man8/lsblk.8 #usr/share/man/man8/lslocks.8 +#usr/share/man/man8/lsns.8 #usr/share/man/man8/mkfs.8 #usr/share/man/man8/mkfs.bfs.8 #usr/share/man/man8/mkfs.cramfs.8 #usr/share/man/man8/mkfs.minix.8 #usr/share/man/man8/mkswap.8 #usr/share/man/man8/mount.8 -#usr/share/man/man8/nologin.8 #usr/share/man/man8/partx.8 #usr/share/man/man8/pivot_root.8 #usr/share/man/man8/raw.8 @@ -300,5 +290,7 @@ usr/sbin/rtcwake #usr/share/man/man8/swapon.8 #usr/share/man/man8/switch_root.8 #usr/share/man/man8/umount.8 +#usr/share/man/man8/uname26.8 #usr/share/man/man8/wdctl.8 #usr/share/man/man8/wipefs.8 +#usr/share/man/man8/zramctl.8