Merge branch 'strongswan-next' into next

diff --git a/config/rootfiles/installer/hid-modules b/config/rootfiles/installer/hid-modules
deleted file mode 100644 (file)
index 3b180e9..0000000
--- a/config/rootfiles/installer/hid-modules
+++ /dev/null
@@ -1 +0,0 @@
-lib/modules/KVER-ipfire/kernel/drivers/hid

diff --git a/config/rootfiles/installer/network-modules b/config/rootfiles/installer/network-modules
deleted file mode 100644 (file)
index 6dabddf..0000000
--- a/config/rootfiles/installer/network-modules
+++ /dev/null
@@ -1 +0,0 @@
-lib/modules/KVER-ipfire/kernel/drivers/net

diff --git a/lfs/initrd b/lfs/initrd
index 740364438e1047af763a07bffb2473dea55b3655..56e19679bf802c30949407dc0590791053694c51 100644 (file)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -64,6 +64,12 @@ $(TARGET) :
 
        -cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
 
+       # Copy hid and network modules
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/hid \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/net \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+
        cd /install/initrd/etc && rm -f fstab
        cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/
        rm -rf /install/initrd/usr/share/man

diff --git a/lfs/transmission b/lfs/transmission
index ab34ee3db6997ef4912b80848d29289fdcc1ab3c..083db58b6b8388862762543b5c6be6e3e7e6ee57 100644 (file)
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.76
+VER        = 2.77
 
 THISAPP    = transmission-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = transmission
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = "libevent2"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9abbffe29ce9b5ee68a116d293c51111
+$(DL_FILE)_MD5 = 60c0e77a1852656215f7102a437b2a3d
 
 install : $(TARGET)