From 0a9912f439976e23de849837f1903bc7a41f7492 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Sikora?= Date: Tue, 1 Jun 2004 02:11:46 +0000 Subject: [PATCH] - cleanups. Changed files: eagle-Makefile.patch -> 1.3 eagle-usb-info_about_VPI_VCI.patch -> 1.2 eagle-usb-user2.6.patch -> 1.2 --- eagle-Makefile.patch | 140 ----------------------------- eagle-usb-info_about_VPI_VCI.patch | 36 -------- eagle-usb-user2.6.patch | 22 ----- 3 files changed, 198 deletions(-) delete mode 100644 eagle-Makefile.patch delete mode 100644 eagle-usb-info_about_VPI_VCI.patch delete mode 100644 eagle-usb-user2.6.patch diff --git a/eagle-Makefile.patch b/eagle-Makefile.patch deleted file mode 100644 index f64ec07..0000000 --- a/eagle-Makefile.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -uNr eagle-1.0.4.orig/driver/Makefile eagle-1.0.4/driver/Makefile ---- eagle-1.0.4.orig/driver/Makefile Wed Jun 18 23:58:41 2003 -+++ eagle-1.0.4/driver/Makefile Wed Jul 9 19:41:39 2003 -@@ -106,7 +106,7 @@ - install: driver installfirmware installuser - mkdir -p $(INSTALLDIR) && \ - mkdir -p $(CONFDIR) && \ -- $(INSTALLER) -m 0664 -o root -g root $(MODULE).o $(INSTALLDIR)/$(MODULE).o && \ -+ $(INSTALLER) $(MODULE).o $(DESTDIR)/$(INSTALLDIR)/$(MODULE).o && \ - /sbin/depmod -a - - uninstall: -diff -uNr eagle-1.0.4.orig/driver/firmware/Makefile eagle-1.0.4/driver/firmware/Makefile ---- eagle-1.0.4.orig/driver/firmware/Makefile Wed Jun 4 01:09:37 2003 -+++ eagle-1.0.4/driver/firmware/Makefile Wed Jul 9 19:42:20 2003 -@@ -33,12 +33,12 @@ - gcc $(CFLAGS) builddsp.c -o buildDSP - - install : firmware.bin DSPcode.bin -- mkdir -p $(CONFIGDIR) -- $(INSTALLER) -c -m 0664 -o root -g root *.bin $(CONFIGDIR) -+ mkdir -p $(DESTDIR)/$(CONFIGDIR) -+ $(INSTALLER) *.bin $(DESTDIR)/$(CONFIGDIR) - - uninstall: -- rm -f $(CONFIGDIR)/DSPcode.bin -- rm -f $(CONFIGDIR)/firmware.bin -+ rm -f $(DESTDIR)/$(CONFIGDIR)/DSPcode.bin -+ rm -f $(DESTDIR)/$(CONFIGDIR)/firmware.bin - - clean : - rm -f firmware.bin buildFirmware buildDSP DSPcode.bin -diff -uNr eagle-1.0.4.orig/driver/user/Makefile eagle-1.0.4/driver/user/Makefile ---- eagle-1.0.4.orig/driver/user/Makefile Wed Jun 4 00:40:37 2003 -+++ eagle-1.0.4/driver/user/Makefile Wed Jul 9 19:40:18 2003 -@@ -15,19 +15,19 @@ - gcc $(CFLAGS) adictrl.c -o adictrl - - install : adictrl sagemf800.conf -- mkdir -p $(CONFIGDIR) -- $(INSTALLER) -c -m 0755 -o root -g root adictrl $(INSTALLDIR) -- $(INSTALLER) -c -m 0755 -o root -g root showstat $(INSTALLDIR) -- $(INSTALLER) -c -m 0755 -o root -g root sagemf800.conf $(CONFIGDIR)/adiusbadsl.conf --# $(INSTALLER) -c -m 0755 -o root -g root CMVep.txt $(CONFIGDIR)/ --# $(INSTALLER) -c -m 0755 -o root -g root CMVei.txt $(CONFIGDIR)/ -+ $(INSTALLER) -d $(DESTDIR)/$(CONFIGDIR) -+ $(INSTALLER) adictrl $(DESTDIR)/$(INSTALLDIR) -+ $(INSTALLER) showstat $(DESTDIR)/$(INSTALLDIR) -+ $(INSTALLER) sagemf800.conf $(DESTDIR)/$(CONFIGDIR)/adiusbadsl.conf -+ $(INSTALLER) CMVep.txt $(DESTDIR)/$(CONFIGDIR) -+ $(INSTALLER) CMVei.txt $(DESTDIR)/$(CONFIGDIR) - - uninstall: -- rm -f $(INSTALLDIR)/adictrl -- rm -f $(INSTALLDIR)/showstat -- rm -f $(CONFIGDIR)/adiusbadsl.conf --# rm -f $(CONFIGDIR)/CMVep.txt --# rm -f $(CONFIGDIR)/CMVei.txt -+ rm -f $(DESTDIR)/$(INSTALLDIR)/adictrl -+ rm -f $(DESTDIR)/$(INSTALLDIR)/showstat -+ rm -f $(DESTDIR)/$(CONFIGDIR)/adiusbadsl.conf -+ rm -f $(DESTDIR)/$(CONFIGDIR)/CMVep.txt -+ rm -f $(DESTDIR)/$(CONFIGDIR)/CMVei.txt - - - -diff -uNr eagle-1.0.4.orig/pppoa/Makefile eagle-1.0.4/pppoa/Makefile ---- eagle-1.0.4.orig/pppoa/Makefile Thu Apr 24 20:42:06 2003 -+++ eagle-1.0.4/pppoa/Makefile Wed Jul 9 19:35:04 2003 -@@ -45,10 +45,10 @@ - gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o debug.o debug.c - - install: pppoa -- $(INSTALLER) -m 775 -o root -g root pppoa /usr/sbin -+ $(INSTALLER) pppoa $(DESTDIR)/usr/sbin - - uninstall: -- rm -f /usr/sbin/pppoa -+ rm -f $(DESTDIR)/usr/sbin/pppoa - - clean: - rm -f *.o pppoa -diff -uNr eagle-1.0.4.orig/scripts/Makefile eagle-1.0.4/scripts/Makefile ---- eagle-1.0.4.orig/scripts/Makefile Wed Jun 18 23:58:02 2003 -+++ eagle-1.0.4/scripts/Makefile Wed Jul 9 19:44:40 2003 -@@ -14,29 +14,29 @@ - ./makescripts - - install: userscripts -- mkdir -p $(HOTPLUGDIR)/usb -+ mkdir -p $(DESTDIR)/$(HOTPLUGDIR)/usb - @if [ -f pap-secrets ]; then \ -- $(INSTALLER) -c -m 0600 -o root -g root pap-secrets $(PPPDIR) ; \ -+ $(INSTALLER) -c pap-secrets $(DESTDIR)/$(PPPDIR) ; \ - fi - @if [ -f chap-secrets ]; then \ -- $(INSTALLER) -c -m 0600 -o root -g root chap-secrets $(PPPDIR) ; \ -+ $(INSTALLER) -c chap-secrets $(DESTDIR)/$(PPPDIR) ; \ - fi - @if [ -f options.adsl ]; then \ -- $(INSTALLER) -c -m 0644 -o root -g root options.adsl $(PPPDIR) ; \ -+ $(INSTALLER) -c options.adsl $(DESTDIR)/$(PPPDIR) ; \ - fi -- $(INSTALLER) -c -m 0554 -o root -g root hotplug/adiusb* $(HOTPLUGDIR)/usb -+ $(INSTALLER) -c hotplug/adiusb* $(DESTDIR)/$(HOTPLUGDIR)/usb - @if [ -f usb.usermap ]; then \ -- $(INSTALLER) -c -m 0644 -o root -g root usb.usermap $(HOTPLUGDIR) ; \ -+ $(INSTALLER) -c usb.usermap $(DESTDIR)/$(HOTPLUGDIR) ; \ - else \ -- $(INSTALLER) -c -m 0644 -o root -g root usb.usermap.local $(HOTPLUGDIR) && \ -+ $(INSTALLER) -c usb.usermap.local $(DESTDIR)/$(HOTPLUGDIR) && \ - /usr/sbin/update-usb.usermap ; \ - fi -- $(INSTALLER) -c -m 0554 -o root -g root adsl/* $(INSTALLDIR) -+ $(INSTALLER) -c adsl/* $(DESTDIR)/$(INSTALLDIR) - rm -f options.adsl options.mire pap-secrets chap-secrets usb.usermap usb.usermap.local - - uninstall: -- rm -f $(PPPDIR)/options.mire -- rm -f $(HOTPLUGDIR)/usb/adiusb* -+ rm -f $(DESTDIR)/$(PPPDIR)/options.mire -+ rm -f $(DESTDIR)/$(HOTPLUGDIR)/usb/adiusb* - ./scriptUninst - - clean: ---- eagle-1.0.4/scripts/makescripts~ Wed Jun 18 21:58:02 2003 -+++ eagle-1.0.4/scripts/makescripts Wed Jul 9 18:20:05 2003 -@@ -28,12 +28,6 @@ - echo $GREETING - echo - --# Check we are root: --if [ `id -ur` != 0 ] ; then -- echo $ROOTMSG -- echo -- exit 1 --fi - - echo -en $DEGROUPEMSG - read REP diff --git a/eagle-usb-info_about_VPI_VCI.patch b/eagle-usb-info_about_VPI_VCI.patch deleted file mode 100644 index c627cdf..0000000 --- a/eagle-usb-info_about_VPI_VCI.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nura eagle-1.0.4/driver/user/sagemf800.conf eagle-1.0.4.new/driver/user/sagemf800.conf ---- eagle-1.0.4/driver/user/sagemf800.conf 2003-02-11 00:29:49.000000000 +0100 -+++ eagle-1.0.4.new/driver/user/sagemf800.conf 2004-04-28 11:28:10.000000000 +0200 -@@ -21,7 +21,31 @@ - # OPTN6=00000000 - # OPTN7=02CD8044 - # OPTN15=09090909 --VPI=00000008 -+ -+# VPI/VCI -+# -+# Country Network Encapsulation VPI VCI (decimal values) -+# -+# Belgium Belgacom PPPoA vcmux 8 35 -+# France FT PPPoA vcmux 8 35 -+# France Free dégroupé IPoA vcmux 8 36 -+# Finland Sonera IPoA LLC 0 100 -+# Germany DT PPPoE LLC 1 32 -+# Hungary Matav PPPoE LLC 1 32 -+# Italy Telecom Italia PPPoA vcmux 8 35 -+# Netherlands KPN PPPoA vcmux 8 48 -+# Poland TPSA PPPoA vcmux 0 35 -+# Portugal PT PPPoE LLC 0 35 -+# Spain Retevision PPPoA vcmux 8 35 -+# Spain Telefonica IPoA vcmux ou PPPoE LLC 8 32 -+# Sweden Telia IPoA LLC 8 35 -+# UK BT PPPoA vcmux 0 38 -+ -+#References: http://damien.bergamini.free.fr/ueagle/vpivci.html -+ -+# VPI/VCI - hex. values - if you use values from table above, -+# you have to convert them from decimal to hex. -+VPI=00000000 - VCI=00000023 - - #The following values are valid for encapsulation : diff --git a/eagle-usb-user2.6.patch b/eagle-usb-user2.6.patch deleted file mode 100644 index efd0465..0000000 --- a/eagle-usb-user2.6.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- eagle-1.0.4/driver/user/adictrl.c.orig 2004-01-18 15:22:15.000000000 +0100 -+++ eagle-1.0.4/driver/user/adictrl.c 2004-01-18 15:35:06.439165640 +0100 -@@ -181,6 +181,8 @@ - */ - - typedef struct usb_device_descriptor -+#ifndef __LINUX_USB_CH9_H -+/* in 2.6 this struct is already available in */ - { - uint8_t bLength; - uint8_t bDescriptorType; -@@ -196,7 +198,9 @@ - uint8_t iProduct; - uint8_t iSerialNumber; - uint8_t bNumConfigurations; --} __attribute__((packed)) usb_dev_desc_t; -+} __attribute__((packed)) -+#endif -+usb_dev_desc_t; - - /** - * cmv_msg_t - CMV message description. -- 2.43.0