]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Dec 2013 13:09:02 +0000 (14:09 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Dec 2013 13:09:02 +0000 (14:09 +0100)
config/kernel/kernel.config.armv5tel-ipfire-multi
config/rootfiles/common/armv5tel/util-linux
config/rootfiles/common/strongswan

index 868a50ccde8554ab580cc177a0e75c8b25e14515..adbc6502e016424d74ca9074391cac388584ae48 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.11-ipfire-multi Kernel Configuration
+# Linux/arm 3.10.21 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_MIGHT_HAVE_PCI=y
@@ -615,6 +615,7 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_KUSER_HELPERS=y
 CONFIG_DMA_CACHE_RWFO=y
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
@@ -1186,7 +1187,7 @@ CONFIG_L2TP_V3=y
 CONFIG_L2TP_IP=m
 CONFIG_L2TP_ETH=m
 CONFIG_STP=y
-CONFIG_GARP=y
+CONFIG_GARP=m
 CONFIG_BRIDGE=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
index d3a010cab332cfef0b3cdbabc57bc0c9bf4316ee..2cefab08f333cdb8199692b481ac2f2b211122bf 100644 (file)
@@ -1,17 +1,25 @@
-#bin/arch
 bin/dmesg
+bin/findmnt
+bin/lsblk
 bin/more
 bin/mount
 bin/umount
-etc/fdprm
+bin/wdctl
+lib/libblkid.so.1.1.0
+lib/libmount.so.1
+lib/libmount.so.1.1.0
+lib/libuuid.so.1.3.0
 sbin/agetty
+sbin/blkdiscard
 sbin/blockdev
 sbin/cfdisk
+sbin/chcpu
 sbin/ctrlaltdel
-#sbin/elvtune
 sbin/fdisk
 #sbin/fsck.cramfs
 sbin/fsck.minix
+sbin/fsfreeze
+sbin/fstrim
 sbin/hwclock
 sbin/losetup
 sbin/mkfs
@@ -19,46 +27,160 @@ sbin/mkfs
 #sbin/mkfs.cramfs
 sbin/mkfs.minix
 sbin/mkswap
+sbin/nologin
 #sbin/pivot_root
+sbin/raw
 sbin/sfdisk
+sbin/swaplabel
 sbin/swapoff
 sbin/swapon
+sbin/switch_root
+sbin/wipefs
 #usr/bin/cal
-#usr/bin/chkdupexe
+#usr/bin/chrt
 #usr/bin/col
 #usr/bin/colcrt
 #usr/bin/colrm
 #usr/bin/column
 #usr/bin/cytune
-#usr/bin/ddate
-usr/bin/fdformat
+usr/bin/eject
+usr/bin/fallocate
 usr/bin/flock
 usr/bin/getopt
 #usr/bin/hexdump
+usr/bin/ionice
+#usr/bin/ipcmk
 #usr/bin/ipcrm
 #usr/bin/ipcs
 #usr/bin/isosize
-#usr/bin/line
+#usr/bin/linux32
+#usr/bin/linux64
 usr/bin/logger
 #usr/bin/look
+usr/bin/lscpu
+usr/bin/lslocks
 #usr/bin/mcookie
 #usr/bin/namei
+usr/bin/nsenter
 usr/bin/pg
-#usr/bin/raw
+usr/bin/prlimit
 usr/bin/rename
 usr/bin/renice
 #usr/bin/rev
 #usr/bin/script
-#usr/bin/setfdprm
+#usr/bin/scriptreplay
+#usr/bin/setarch
 #usr/bin/setsid
 #usr/bin/setterm
 #usr/bin/tailf
+#usr/bin/taskset
 #usr/bin/ul
+#usr/bin/unshare
 #usr/bin/whereis
-#usr/bin/write
+#usr/include/libmount
+#usr/include/libmount/libmount.h
+#usr/lib/libblkid.la
+#usr/lib/libmount.a
+#usr/lib/libmount.la
+usr/lib/libmount.so
+#usr/lib/libuuid.la
+#usr/lib/pkgconfig/mount.pc
+usr/sbin/addpart
+usr/sbin/delpart
+usr/sbin/fdformat
+usr/sbin/ldattach
+usr/sbin/partx
 #usr/sbin/readprofile
-#usr/sbin/tunelp
-#usr/share/info/ipc.info
+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
+#usr/share/bash-completion/completions/blockdev
+#usr/share/bash-completion/completions/cal
+#usr/share/bash-completion/completions/cfdisk
+#usr/share/bash-completion/completions/chcpu
+#usr/share/bash-completion/completions/chrt
+#usr/share/bash-completion/completions/col
+#usr/share/bash-completion/completions/colcrt
+#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
+#usr/share/bash-completion/completions/fallocate
+#usr/share/bash-completion/completions/fdformat
+#usr/share/bash-completion/completions/fdisk
+#usr/share/bash-completion/completions/findmnt
+#usr/share/bash-completion/completions/flock
+#usr/share/bash-completion/completions/fsck
+#usr/share/bash-completion/completions/fsck.cramfs
+#usr/share/bash-completion/completions/fsck.minix
+#usr/share/bash-completion/completions/fsfreeze
+#usr/share/bash-completion/completions/fstrim
+#usr/share/bash-completion/completions/getopt
+#usr/share/bash-completion/completions/hexdump
+#usr/share/bash-completion/completions/hwclock
+#usr/share/bash-completion/completions/ionice
+#usr/share/bash-completion/completions/ipcrm
+#usr/share/bash-completion/completions/ipcs
+#usr/share/bash-completion/completions/isosize
+#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/lslocks
+#usr/share/bash-completion/completions/mcookie
+#usr/share/bash-completion/completions/mesg
+#usr/share/bash-completion/completions/mkfs
+#usr/share/bash-completion/completions/mkfs.bfs
+#usr/share/bash-completion/completions/mkfs.cramfs
+#usr/share/bash-completion/completions/mkfs.minix
+#usr/share/bash-completion/completions/mkswap
+#usr/share/bash-completion/completions/more
+#usr/share/bash-completion/completions/mountpoint
+#usr/share/bash-completion/completions/namei
+#usr/share/bash-completion/completions/nsenter
+#usr/share/bash-completion/completions/partx
+#usr/share/bash-completion/completions/pg
+#usr/share/bash-completion/completions/pivot_root
+#usr/share/bash-completion/completions/prlimit
+#usr/share/bash-completion/completions/raw
+#usr/share/bash-completion/completions/readprofile
+#usr/share/bash-completion/completions/rename
+#usr/share/bash-completion/completions/renice
+#usr/share/bash-completion/completions/resizepart
+#usr/share/bash-completion/completions/rev
+#usr/share/bash-completion/completions/rtcwake
+#usr/share/bash-completion/completions/script
+#usr/share/bash-completion/completions/scriptreplay
+#usr/share/bash-completion/completions/setarch
+#usr/share/bash-completion/completions/setsid
+#usr/share/bash-completion/completions/setterm
+#usr/share/bash-completion/completions/sfdisk
+#usr/share/bash-completion/completions/swaplabel
+#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/unshare
+#usr/share/bash-completion/completions/utmpdump
+#usr/share/bash-completion/completions/uuidd
+#usr/share/bash-completion/completions/uuidgen
+#usr/share/bash-completion/completions/wall
+#usr/share/bash-completion/completions/wdctl
+#usr/share/bash-completion/completions/whereis
+#usr/share/bash-completion/completions/wipefs
+#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
@@ -67,12 +189,21 @@ usr/bin/renice
 #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
@@ -81,68 +212,90 @@ usr/bin/renice
 #usr/share/locale/uk
 #usr/share/locale/uk/LC_MESSAGES
 #usr/share/locale/uk/LC_MESSAGES/util-linux.mo
-#usr/share/man/man1/arch.1
+#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/chkdupexe.1
+#usr/share/man/man1/chrt.1
 #usr/share/man/man1/col.1
 #usr/share/man/man1/colcrt.1
 #usr/share/man/man1/colrm.1
 #usr/share/man/man1/column.1
-#usr/share/man/man1/ddate.1
+#usr/share/man/man1/dmesg.1
+#usr/share/man/man1/eject.1
+#usr/share/man/man1/fallocate.1
 #usr/share/man/man1/flock.1
 #usr/share/man/man1/getopt.1
 #usr/share/man/man1/hexdump.1
-#usr/share/man/man1/line.1
+#usr/share/man/man1/ionice.1
+#usr/share/man/man1/ipcmk.1
+#usr/share/man/man1/ipcrm.1
+#usr/share/man/man1/ipcs.1
 #usr/share/man/man1/look.1
+#usr/share/man/man1/lscpu.1
 #usr/share/man/man1/mcookie.1
 #usr/share/man/man1/more.1
 #usr/share/man/man1/namei.1
+#usr/share/man/man1/nsenter.1
 #usr/share/man/man1/pg.1
-#usr/share/man/man1/readprofile.1
+#usr/share/man/man1/prlimit.1
 #usr/share/man/man1/rename.1
+#usr/share/man/man1/renice.1
 #usr/share/man/man1/rev.1
 #usr/share/man/man1/script.1
+#usr/share/man/man1/scriptreplay.1
+#usr/share/man/man1/setsid.1
 #usr/share/man/man1/setterm.1
 #usr/share/man/man1/tailf.1
+#usr/share/man/man1/taskset.1
 #usr/share/man/man1/ul.1
+#usr/share/man/man1/unshare.1
 #usr/share/man/man1/whereis.1
-#usr/share/man/man1/write.1
+#usr/share/man/man3/uuid_generate_time_safe.3
 #usr/share/man/man5/fstab.5
-#usr/share/man/man5/nfs.5
+#usr/share/man/man8/addpart.8
 #usr/share/man/man8/agetty.8
+#usr/share/man/man8/blkdiscard.8
 #usr/share/man/man8/blockdev.8
 #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/dmesg.8
-#usr/share/man/man8/elvtune.8
+#usr/share/man/man8/delpart.8
 #usr/share/man/man8/fdformat.8
 #usr/share/man/man8/fdisk.8
+#usr/share/man/man8/findmnt.8
+#usr/share/man/man8/fsck.cramfs.8
 #usr/share/man/man8/fsck.minix.8
+#usr/share/man/man8/fsfreeze.8
+#usr/share/man/man8/fstrim.8
 #usr/share/man/man8/hwclock.8
-#usr/share/man/man8/ipcrm.8
-#usr/share/man/man8/ipcs.8
 #usr/share/man/man8/isosize.8
+#usr/share/man/man8/ldattach.8
+#usr/share/man/man8/linux32.8
+#usr/share/man/man8/linux64.8
 #usr/share/man/man8/losetup.8
+#usr/share/man/man8/lsblk.8
+#usr/share/man/man8/lslocks.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
-#usr/share/man/man8/renice.8
-#usr/share/man/man8/setfdprm.8
-#usr/share/man/man8/setsid.8
+#usr/share/man/man8/readprofile.8
+#usr/share/man/man8/resizepart.8
+#usr/share/man/man8/rtcwake.8
+#usr/share/man/man8/setarch.8
 #usr/share/man/man8/sfdisk.8
-#usr/share/man/man8/sln.8
+#usr/share/man/man8/swaplabel.8
 #usr/share/man/man8/swapoff.8
 #usr/share/man/man8/swapon.8
-#usr/share/man/man8/tunelp.8
+#usr/share/man/man8/switch_root.8
 #usr/share/man/man8/umount.8
-#usr/share/misc/getopt
-#usr/share/misc/getopt/getopt-parse.bash
-#usr/share/misc/getopt/getopt-parse.tcsh
-#usr/share/misc/getopt/getopt-test.bash
-#usr/share/misc/getopt/getopt-test.tcsh
-var/lib/hwclock
+#usr/share/man/man8/wdctl.8
+#usr/share/man/man8/wipefs.8
index 46b2465ca4bbf4b6fafb8fd12cedbf0cc6613e46..0e18580d971897de1ebfb0cd7d6650a8d41000e5 100644 (file)
@@ -68,7 +68,7 @@ usr/lib/ipsec/plugins/libstrongswan-pkcs8.so
 usr/lib/ipsec/plugins/libstrongswan-pubkey.so
 usr/lib/ipsec/plugins/libstrongswan-random.so
 usr/lib/ipsec/plugins/libstrongswan-rc2.so
-usr/lib/ipsec/plugins/libstrongswan-rdrand.so
+#usr/lib/ipsec/plugins/libstrongswan-rdrand.so
 usr/lib/ipsec/plugins/libstrongswan-resolve.so
 usr/lib/ipsec/plugins/libstrongswan-revocation.so
 usr/lib/ipsec/plugins/libstrongswan-sha1.so