eciadsl/ixp4xx-kernel: Add eciadsl package and HDLC support

8 files changed, 149 insertions, 2 deletions

diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index e378edacbb..dec59f9f68 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -45,6 +45,7 @@ ${PKGDIR}/packages/dropbear/*.bb \
 ${PKGDIR}/packages/dsniff/*.bb \
 ${PKGDIR}/packages/e2fsprogs/*.bb \
 ${PKGDIR}/packages/e2fsprogs-libs/*.bb \
+${PKGDIR}/packages/eciadsl/*.bb \
 ${PKGDIR}/packages/expat/*.bb \
 ${PKGDIR}/packages/ez-ipupdate/*.bb \
 ${PKGDIR}/packages/fakeroot/*.bb \
diff --git a/packages/eciadsl/.mtn2git_empty b/packages/eciadsl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/eciadsl/.mtn2git_empty
diff --git a/packages/eciadsl/eciadsl_0.11.bb b/packages/eciadsl/eciadsl_0.11.bb
new file mode 100644
index 0000000000..2d0efe34a6
--- /dev/null
+++ b/packages/eciadsl/eciadsl_0.11.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "eciadsl is a usermode driver for GlobeSpan-based ADSL modems"
+SECTION = "net"
+SRC_URI = "http://eciadsl.flashtux.org/download/eciadsl-usermode-${PV}.tar.gz \
+           file://eciadsl-bash.patch;patch=1"
+LICENSE = "GPL"
+RDEPENDS = "bash kernel-module-n_hdlc ppp grep"
+S = "${WORKDIR}/eciadsl-usermode-${PV}"
+
+inherit autotools
diff --git a/packages/eciadsl/files/.mtn2git_empty b/packages/eciadsl/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/eciadsl/files/.mtn2git_empty
diff --git a/packages/eciadsl/files/eciadsl-bash.patch b/packages/eciadsl/files/eciadsl-bash.patch
new file mode 100644
index 0000000000..3c4334f277
--- /dev/null
+++ b/packages/eciadsl/files/eciadsl-bash.patch
@@ -0,0 +1,135 @@
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-config-text eciadsl-usermode-0..11/eciadsl-config-text
+--- eciadsl-usermode-0.11-old/eciadsl-config-text	2005-09-24 10:02:51.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-config-text	2006-03-03 10:26:44.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # EciAdsl Linux driver configuration script.
+ # Same goal as eciadsl-config-tk, but can be run in a terminal / console.
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-config-text.in eciadsl-usermode-0.11/eciadsl-config-text.in
+--- eciadsl-usermode-0.11-old/eciadsl-config-text.in	2005-04-16 15:31:29.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-config-text.in	2006-03-03 10:26:39.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # EciAdsl Linux driver configuration script.
+ # Same goal as eciadsl-config-tk, but can be run in a terminal / console.
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-doctor eciadsl-usermode-0.11/eciadsl-doctor
+--- eciadsl-usermode-0.11-old/eciadsl-doctor	2005-09-24 10:02:51.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-doctor	2006-03-03 10:27:06.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Author: Benoit PAPILLAULT <benoit.papillault@free.fr>
+ # Creation: 01/02/2002
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-doctor.in eciadsl-usermode-0.11/eciadsl-doctor.in
+--- eciadsl-usermode-0.11-old/eciadsl-doctor.in	2005-04-16 15:31:29.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-doctor.in	2006-03-03 10:27:01.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Author: Benoit PAPILLAULT <benoit.papillault@free.fr>
+ # Creation: 01/02/2002
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-makeconfig eciadsl-usermode-0.11/eciadsl-makeconfig
+--- eciadsl-usermode-0.11-old/eciadsl-makeconfig	2005-09-24 10:02:51.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-makeconfig	2006-03-03 10:27:13.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # ************************************************************************
+ # *                                                                      *
+ # *   eciadsl-makeconfig - EciAdsl Linux driver configuration script     *
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-makeconfig.in eciadsl-usermode-0.11/eciadsl-makeconfig.in
+--- eciadsl-usermode-0.11-old/eciadsl-makeconfig.in	2005-04-16 15:31:29.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-makeconfig.in	2006-03-03 10:27:18.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # ************************************************************************
+ # *                                                                      *
+ # *   eciadsl-makeconfig - EciAdsl Linux driver configuration script     *
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-probe-device eciadsl-usermode-0.11/eciadsl-probe-device
+--- eciadsl-usermode-0.11-old/eciadsl-probe-device	2004-11-06 13:47:05.000000000 +0000
++++ eciadsl-usermode-0.11/eciadsl-probe-device	2006-03-03 10:27:28.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Author : wwp <subscript@free.fr>
+ # Creation : 2002/10/16
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-probe-synch eciadsl-usermode-0..11/eciadsl-probe-synch
+--- eciadsl-usermode-0.11-old/eciadsl-probe-synch	2004-12-28 19:16:58.000000000 +0000
++++ eciadsl-usermode-0.11/eciadsl-probe-synch	2006-03-03 10:27:35.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # probe device's VIDs and PIDs
+ 
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-remove-dabusb eciadsl-usermode-0.11/eciadsl-remove-dabusb
+--- eciadsl-usermode-0.11-old/eciadsl-remove-dabusb	2005-09-24 10:02:51.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-remove-dabusb	2006-03-03 10:27:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # ************************************************************************
+ # *                                                                      *
+ # *   eciadsl-remove-dabusb v0.1 - dabusb destroyer script               *
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-remove-dabusb.in eciadsl-usermode-0.11/eciadsl-remove-dabusb.in
+--- eciadsl-usermode-0.11-old/eciadsl-remove-dabusb.in	2005-04-16 15:31:29.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-remove-dabusb.in	2006-03-03 10:27:51.000000000 +0000
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # ************************************************************************
+ # *                                                                      *
+ # *   eciadsl-remove-dabusb v0.1 - dabusb destroyer script               *
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-start eciadsl-usermode-0.11/eciadsl-start
+--- eciadsl-usermode-0.11-old/eciadsl-start	2005-09-24 10:02:51.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-start	2006-03-03 10:31:38.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # Author   : Jean-Sebastien VALETTE <jean-sebastien.valette@libertysurf.fr>
+ # Creation : 06/12/2001
+@@ -543,7 +543,7 @@
+ case "$mode" in
+ "VCM_RFC2364"|"LLC_RFC2364")
+ 
+-    nice --20 pppd call adsl updetach
++    nice -n-20 pppd call adsl updetach
+     if [ $? -ne 0 ]; then
+         echo "ERROR: failed to connect"
+         exit $STEP
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-start.in eciadsl-usermode-0.11/eciadsl-start.in
+--- eciadsl-usermode-0.11-old/eciadsl-start.in	2005-09-24 09:42:15.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-start.in	2006-03-03 10:31:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # Author   : Jean-Sebastien VALETTE <jean-sebastien.valette@libertysurf.fr>
+ # Creation : 06/12/2001
+@@ -543,7 +543,7 @@
+ case "$mode" in
+ "VCM_RFC2364"|"LLC_RFC2364")
+ 
+-    nice --20 @pppdpath@ call adsl updetach
++    nice -n20 @pppdpath@ call adsl updetach
+     if [ $? -ne 0 ]; then
+         echo "ERROR: failed to connect"
+         exit $STEP
+diff -Naur eciadsl-usermode-0.11-old/eciadsl-stop eciadsl-usermode-0.11/eciadsl-stop
+--- eciadsl-usermode-0.11-old/eciadsl-stop	2005-06-11 08:05:46.000000000 +0100
++++ eciadsl-usermode-0.11/eciadsl-stop	2006-03-03 10:28:13.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # eciadsl-stop: stop EciAdsl connection
+ #
diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig
index 014ff73135..3213ff8c1c 100644
--- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig
@@ -914,7 +914,8 @@ CONFIG_INPUT_IXP4XX_BEEPER=y
 # Character devices
 #
 # CONFIG_VT is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_N_HDLC=m
 
 #
 # Serial drivers
diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb b/packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb
index e47f20a7ab..1a2563cdb7 100644
--- a/packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb
@@ -3,7 +3,7 @@
 # Increment PR_CONFIG for changes to the ixp4xx-kernel specific
 # defconfig (do *NOT* increment anything in here for changes
 # to other kernel configs!)
-PR_CONFIG = "0"
+PR_CONFIG = "1"
 #
 # Increment the number below (i.e. the digits after PR) when
 # making changes within this file or for changes to the patches
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 6c3cdd3ae0..f4036fe613 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -50,6 +50,7 @@ SLUGOS_PACKAGES = "\
 	dnsmasq \
 	e2fsprogs \
 	e2fsprogs-libs \
+	eciadsl \
 	expat \
 	ez-ipupdate \
 	fetchmail \