summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-14 17:22:37 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-14 17:22:37 +0000
commitef01898d984dcf9e7c044d5a7b638f69b1ef6b76 (patch)
tree043e9c3fedb060a0a640a4a0a872f45170884c91
parent35d3c8addbc139e42cb8e9e90c16099b2c8f3298 (diff)
make kernel ppp optional and remove cramfs support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@372 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/dropbear/files/passwd2
-rw-r--r--openwrt/package/linux/Config.in7
-rw-r--r--openwrt/package/linux/Makefile3
-rw-r--r--openwrt/package/linux/control/kmod-ppp.control8
-rw-r--r--openwrt/package/linux/linux.config4
-rw-r--r--openwrt/package/ppp/Config.in1
-rw-r--r--openwrt/package/ppp/control/ppp.control1
7 files changed, 23 insertions, 3 deletions
diff --git a/openwrt/package/dropbear/files/passwd b/openwrt/package/dropbear/files/passwd
index ae383d03d..8c69ba335 100644
--- a/openwrt/package/dropbear/files/passwd
+++ b/openwrt/package/dropbear/files/passwd
@@ -1 +1 @@
-root:$1$$qRPK7m23GJusamGpoGLby/:0:0:root:/tmp:/bin/ash
+root:$1$$F1Mlz4sQUgmmLkqZr8jnR/:0:0:root:/tmp:/bin/ash
diff --git a/openwrt/package/linux/Config.in b/openwrt/package/linux/Config.in
index bcb73db91..99cb26f70 100644
--- a/openwrt/package/linux/Config.in
+++ b/openwrt/package/linux/Config.in
@@ -50,10 +50,17 @@ config BR2_PACKAGE_KMOD_CRYPTO
help
Kernel modules for cryptographic algorithms
+config BR2_PACKAGE_KMOD_PPP
+ tristate "PPP support"
+ default m
+ help
+ Kernel support for PPP
+
config BR2_PACKAGE_KMOD_MPPE
tristate "PPP MPPE/MPPC module"
default m
select BR2_PACKAGE_KMOD_CRYPTO
+ depends BR2_PACKAGE_KMOD_PPP
help
Support for Microsoft PPP Encryption/Compression
diff --git a/openwrt/package/linux/Makefile b/openwrt/package/linux/Makefile
index c6c270b2d..914d73a75 100644
--- a/openwrt/package/linux/Makefile
+++ b/openwrt/package/linux/Makefile
@@ -53,6 +53,9 @@ $(eval $(call KMOD_template,USB,usb,\
$(eval $(call KMOD_template,CRYPTO,crypto,\
$(MODULES_DIR)/kernel/crypto/*.o \
))
+$(eval $(call KMOD_template,PPP,ppp,\
+ $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \
+))
$(eval $(call KMOD_template,MPPE,mppe,\
$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.o \
))
diff --git a/openwrt/package/linux/control/kmod-ppp.control b/openwrt/package/linux/control/kmod-ppp.control
new file mode 100644
index 000000000..4c2a4c271
--- /dev/null
+++ b/openwrt/package/linux/control/kmod-ppp.control
@@ -0,0 +1,8 @@
+Package: kmod-ppp
+Priority: optional
+Section: net
+Version: 2.4.29-1
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: PPP support
diff --git a/openwrt/package/linux/linux.config b/openwrt/package/linux/linux.config
index dada53e2d..4d2a7ef1c 100644
--- a/openwrt/package/linux/linux.config
+++ b/openwrt/package/linux/linux.config
@@ -680,7 +680,7 @@ CONFIG_NET_ETHERNET=y
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PLIP is not set
-CONFIG_PPP=y
+CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=m
@@ -853,7 +853,7 @@ CONFIG_JFFS2_BBC_LZO=y
CONFIG_JFFS2_BBC_LZARI=y
CONFIG_JFFS2_BBC_LZHD=y
CONFIG_JFFS2_BBC_LZSS=y
-CONFIG_CRAMFS=y
+# CONFIG_CRAMFS is not set
CONFIG_SQUASHFS=y
# CONFIG_TMPFS is not set
CONFIG_RAMFS=y
diff --git a/openwrt/package/ppp/Config.in b/openwrt/package/ppp/Config.in
index 1d4aecbfa..1f92022ef 100644
--- a/openwrt/package/ppp/Config.in
+++ b/openwrt/package/ppp/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PPP
tristate
+ select BR2_PACKAGE_KMOD_PPP
prompt "PPP daemon"
default y
diff --git a/openwrt/package/ppp/control/ppp.control b/openwrt/package/ppp/control/ppp.control
index 68b2dffb7..3f6163eca 100644
--- a/openwrt/package/ppp/control/ppp.control
+++ b/openwrt/package/ppp/control/ppp.control
@@ -5,4 +5,5 @@ Version: 2.4.3-3
Architecture: mipsel
Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
Source: buildroot internal
+Depends: kmod-ppp
Description: a PPP (Point-to-Point Protocol) daemon (with MPPE/MPPC support)