diff -u unicorn-0.9.3/debian/control unicorn-0.9.3/debian/control --- unicorn-0.9.3/debian/control +++ unicorn-0.9.3/debian/control @@ -15,7 +15,7 @@ Bewan ADSL modems. Package: unicorn-source -Architecture: all +Architecture: i386 Depends: make, debhelper, kernel-package, libc6-dev, quilt Description: Source for the Bewan ADSL PCI st and USB unicorn driver This package provides the source code for the unicorn kernel modules. @@ -28,0 +29 @@ + diff -u unicorn-0.9.3/debian/changelog unicorn-0.9.3/debian/changelog --- unicorn-0.9.3/debian/changelog +++ unicorn-0.9.3/debian/changelog @@ -1,3 +1,11 @@ +unicorn (0.9.3-2~rzr2) unstable; urgency=low + + * Add patches to be built on actual kernel (Closes: #394465) : + - bewan-adsl-0.9.3-linux-2.6.26.patch from me + (Note that currently it fails to build using m-a) + + -- Philippe Coval Thu, 06 Nov 2008 16:01:01 +0100 + unicorn (0.9.3-2) unstable; urgency=low * Add gentoo patches "bewan-adsl-0.9.3-patches-20061220.tar.gz" diff -u unicorn-0.9.3/debian/rules unicorn-0.9.3/debian/rules --- unicorn-0.9.3/debian/rules +++ unicorn-0.9.3/debian/rules @@ -1,4 +1,4 @@ -#!/usr/bin/make -f +#! /usr/bin/make -f # Sample debian/rules that uses debhelper. # GNU copyright 1997 by Joey Hess. # @@ -135,24 +135,32 @@ # responsible for cleaning up any changes that have been made by the # other kdist_commands (except for the .deb files created). kdist_clean: - $(MAKE) $(MFLAGS) debian/rules clean + -$(MAKE) -k $(MFLAGS) debian/rules clean ### end KERNEL SETUP -#ugly hack to use gentoo patches -CXX_FILES?=amu/amas.cpp amu/amu.cpp amu/bsp_pci.cpp amu/bsp_usb.cpp msw/msw.cpp +GENERATED_C_FILES?=\ + adsl_status/config.h adsl_status/Makefile adsl_status/*/Makefile \ + adsl_status/po/Makefile.in \ + */modules.order \ + # -GENERATED_C_FILES?=${CXX_FILES:.cpp=.c} +#ugly hack to use gentoo patches +CXX_FILES?=amu/amas.cpp amu/amu.cpp amu/bsp_pci.cpp amu/bsp_usb.cpp \ + msw/msw.cpp %.c: %.cpp - ln -fs ${ RETRY_WAIT_TIME_MIN_MSEC) // STM Gian Set RetryTime Only if is Bigger then minimum value -- RETRY_WAIT_TIME = RetryTime / PM_FM_POLLING_RATE; - unsigned long INIT_POLLING_TIME = 5; //(??????) - unsigned long WAITFOR_DISORDERLY_COUNT = 3; - -+ UINT delay = 0; -+ -+ if (RetryTime > RETRY_WAIT_TIME_MIN_MSEC) // STM Gian Set RetryTime Only if is Bigger then minimum value -+ RETRY_WAIT_TIME = RetryTime / PM_FM_POLLING_RATE; -+ -+ PRINT_ERROR("FmPollingRate=%ldms,InitTimeout=%ldms,ActTimeout=%ld\n", -+ FmPollingRate,InitTimeout,ActTimeout); -+ - NEAR_LCDNI_COUNT = LCD_Trig / PM_FM_POLLING_RATE; - NEAR_LCDI_COUNT = NEAR_LCDNI_COUNT; - NEAR_LOS_COUNT = LOS_LOF_Trig / PM_FM_POLLING_RATE; -@@ -194,8 +203,6 @@ - FAR_LOS_SHORT_COUNT = NEAR_LOS_COUNT; - FAR_LOF_SHORT_COUNT = NEAR_LOS_COUNT; - -- UINT delay = 0; -- - while (amu_go) - { - xtm_wkafter(500); -@@ -279,7 +286,7 @@ - g_WaitForDisorderly++; - if(g_WaitForDisorderly >= WAITFOR_DISORDERLY_COUNT) - { -- -+ int i; - - // if (RetryTime != 0) - // msw_report_event(AMU_EVENT_RETRY,0); -@@ -297,7 +304,7 @@ - if(l_RetCode != C_AMSW_ACK) { - PRINT_ERROR("Error in AMSW_ANT_requestModemStateChange(C_AMSW_IDLE) = %d\n", l_RetCode); - } -- else for (int i=0; i<6; i++) -+ else for (i=0; i<6; i++) - { - if (g_ModemState == C_AMSW_IDLE || GlobalRemove) break; - xtm_wkafter(500); -@@ -345,7 +352,7 @@ - // LCDI (Loss Of Cell Delineation Interleaved), - // LCDNI (Loss Of Cell Delineation Fast)defects - --unsigned long FM_Polling(bool pm_poll) -+unsigned long FM_Polling(BOOLEAN pm_poll) - { - unsigned long l_RetCode = C_AMSW_REJ; - -@@ -361,8 +368,8 @@ - //####################### Loss Of Signal ############################## - - if( ((g_def_bitmap_set.near_end.status & LOS) == LOS) || -- ((g_def_bitmap_set.near_end.status & LOS) == 0) && -- ((g_def_bitmap_set.near_end.change & LOS) == LOS) ) -+ (((g_def_bitmap_set.near_end.status & LOS) == 0) && -+ ((g_def_bitmap_set.near_end.change & LOS) == LOS)) ) - { - g_NEAR_LOS++; - } -@@ -371,8 +378,8 @@ - g_NEAR_LOS = 0; - } - if( ((g_def_bitmap_set.far_end.status & LOS) == LOS) || -- ((g_def_bitmap_set.far_end.status & LOS) == 0) && -- ((g_def_bitmap_set.far_end.change & LOS) == LOS) ) -+ (((g_def_bitmap_set.far_end.status & LOS) == 0) && -+ ((g_def_bitmap_set.far_end.change & LOS) == LOS)) ) - { - g_FAR_LOS++; - } -diff -Nru unicorn.orig/amu/amu.h unicorn/amu/amu.h ---- unicorn.orig/amu/amu.h 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/amu/amu.h 2006-12-20 20:56:25.000000000 +0200 +Index: unicorn-0.9.3/amu/amu.h +=================================================================== +--- unicorn-0.9.3.orig/amu/amu.h 2008-10-10 16:24:06.000000000 +0200 ++++ unicorn-0.9.3/amu/amu.h 2008-10-10 16:58:38.000000000 +0200 @@ -30,7 +30,7 @@ unsigned char g_FAR_LOS = 0, g_FAR_LOF = 0, g_FAR_LCDNI = 0, g_FAR_LCDI = 0; unsigned char g_Mode = AMSW_ANSI | AMSW_UAWG | AMSW_G_DMT | AMSW_G_LITE; @@ -156,9 +20,10 @@ unsigned long PM_Polling(void); #endif // _AMU_H_ -diff -Nru unicorn.orig/amu/bsp.h unicorn/amu/bsp.h ---- unicorn.orig/amu/bsp.h 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/amu/bsp.h 2006-12-20 20:56:25.000000000 +0200 +Index: unicorn-0.9.3/amu/bsp.h +=================================================================== +--- unicorn-0.9.3.orig/amu/bsp.h 2008-10-10 16:24:06.000000000 +0200 ++++ unicorn-0.9.3/amu/bsp.h 2008-10-10 16:58:38.000000000 +0200 @@ -18,7 +18,9 @@ #define DMT_IN_PIN0_MASK 0x0001 // GP_IN0 bit 0 #define DMT_IN_PIN1_MASK 0x0002 // GP_IN1 bit 1 @@ -178,33 +43,10 @@ +#endif #endif -diff -Nru unicorn.orig/amu/bsp_pci.c unicorn/amu/bsp_pci.c ---- unicorn.orig/amu/bsp_pci.c 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/amu/bsp_pci.c 2006-12-20 20:56:25.000000000 +0200 -@@ -98,10 +98,18 @@ - return 0; - } - --extern "C" void HandleAtmError(void) -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+void HandleAtmError(void) - { - } - --extern "C" void HandleLeds(void) -+void HandleLeds(void) - { - } -+ -+#ifdef __cplusplus -+} -+#endif -diff -Nru unicorn.orig/include/types.h unicorn/include/types.h ---- unicorn.orig/include/types.h 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/include/types.h 2006-12-20 20:56:25.000000000 +0200 +Index: unicorn-0.9.3/include/types.h +=================================================================== +--- unicorn-0.9.3.orig/include/types.h 2008-10-10 16:24:06.000000000 +0200 ++++ unicorn-0.9.3/include/types.h 2008-10-10 16:58:38.000000000 +0200 @@ -29,9 +29,6 @@ typedef const char *PCSTR, FAR *LPCSTR; typedef void *PVOID, FAR *LPVOID; @@ -215,9 +57,10 @@ #ifndef MAX -diff -Nru unicorn.orig/msw/fp_stubs.c unicorn/msw/fp_stubs.c ---- unicorn.orig/msw/fp_stubs.c 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/msw/fp_stubs.c 2006-12-20 21:00:53.000000000 +0200 +Index: unicorn-0.9.3/msw/fp_stubs.c +=================================================================== +--- unicorn-0.9.3.orig/msw/fp_stubs.c 2008-10-10 16:24:05.000000000 +0200 ++++ unicorn-0.9.3/msw/fp_stubs.c 2008-10-10 16:58:38.000000000 +0200 @@ -1,11 +1,13 @@ -#include +#include @@ -234,9 +77,10 @@ #include #include #include -diff -Nru unicorn.orig/msw/linrapi.c unicorn/msw/linrapi.c ---- unicorn.orig/msw/linrapi.c 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/msw/linrapi.c 2006-12-20 21:00:15.000000000 +0200 +Index: unicorn-0.9.3/msw/linrapi.c +=================================================================== +--- unicorn-0.9.3.orig/msw/linrapi.c 2008-10-10 16:24:05.000000000 +0200 ++++ unicorn-0.9.3/msw/linrapi.c 2008-10-10 16:58:38.000000000 +0200 @@ -5,8 +5,10 @@ This file contain the rAPI(reduced API) functions. rAPI is the interface between the Modem SW and the Operating System (here Linux). @@ -258,45 +102,10 @@ extern void __builtin_delete(void *ptr) { -diff -Nru unicorn.orig/msw/msw.c unicorn/msw/msw.c ---- unicorn.orig/msw/msw.c 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/msw/msw.c 2006-12-20 20:56:25.000000000 +0200 -@@ -6,7 +6,7 @@ - // Copyright STMicroelectronics 2000 - // Copyright F.H.L.P. 2000 - //---------------------------------------------------------------------- --#include -+// #include - #include "types.h" - #include "tracetool.h" - #include "hal.h" -@@ -24,10 +24,10 @@ - extern unsigned long g_ModemState; - extern unsigned int g_WaitForInit; - extern unsigned int g_WaitForShowtime; --extern bool L3_flag; -+extern BOOLEAN L3_flag; - extern unsigned long GlobalRemove; - --#if 1 -+#if 0 - extern void *operator new(size_t size) - { - void *ptr; -@@ -186,8 +186,9 @@ - } - else - { -+ int i; - PRINT_ERROR("Waiting 5 sec to verify L3_executed\n"); -- for (int i=0; i<10; i++) -+ for (i=0; i<10; i++) - { - // Abort everything on surprise removal - if (GlobalRemove) return; -diff -Nru unicorn.orig/unicorn_atm/unicorn_atmdrv.c unicorn/unicorn_atm/unicorn_atmdrv.c ---- unicorn.orig/unicorn_atm/unicorn_atmdrv.c 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/unicorn_atm/unicorn_atmdrv.c 2006-12-20 21:01:05.000000000 +0200 +Index: unicorn-0.9.3/unicorn_atm/unicorn_atmdrv.c +=================================================================== +--- unicorn-0.9.3.orig/unicorn_atm/unicorn_atmdrv.c 2008-10-10 16:24:04.000000000 +0200 ++++ unicorn-0.9.3/unicorn_atm/unicorn_atmdrv.c 2008-10-10 16:58:38.000000000 +0200 @@ -4,8 +4,10 @@ ST70134A or ST70136 Analog Front End (AFE). This file contains the ATM interface and SAR routines. @@ -331,9 +140,10 @@ #endif #endif -diff -Nru unicorn.orig/unicorn_eth/unicorn_ethdrv.c unicorn/unicorn_eth/unicorn_ethdrv.c ---- unicorn.orig/unicorn_eth/unicorn_ethdrv.c 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/unicorn_eth/unicorn_ethdrv.c 2006-12-20 20:59:57.000000000 +0200 +Index: unicorn-0.9.3/unicorn_eth/unicorn_ethdrv.c +=================================================================== +--- unicorn-0.9.3.orig/unicorn_eth/unicorn_ethdrv.c 2008-10-10 16:24:04.000000000 +0200 ++++ unicorn-0.9.3/unicorn_eth/unicorn_ethdrv.c 2008-10-10 16:58:38.000000000 +0200 @@ -4,8 +4,10 @@ ST70134A or ST70136 Analog Front End (AFE). This file contains the ethernet interface and SAR routines. @@ -386,9 +196,10 @@ #endif #endif -diff -Nru unicorn.orig/unicorn_pci/unicorn_pcidrv.c unicorn/unicorn_pci/unicorn_pcidrv.c ---- unicorn.orig/unicorn_pci/unicorn_pcidrv.c 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/unicorn_pci/unicorn_pcidrv.c 2006-12-20 20:59:31.000000000 +0200 +Index: unicorn-0.9.3/unicorn_pci/unicorn_pcidrv.c +=================================================================== +--- unicorn-0.9.3.orig/unicorn_pci/unicorn_pcidrv.c 2008-10-10 16:24:04.000000000 +0200 ++++ unicorn-0.9.3/unicorn_pci/unicorn_pcidrv.c 2008-10-10 16:58:38.000000000 +0200 @@ -4,8 +4,10 @@ ST70134A, ST70136 or ST20174 Analog Front End (AFE). This file contains the PCI specific routines. @@ -469,9 +280,10 @@ #endif static int __init -diff -Nru unicorn.orig/unicorntest/unicorntest.c unicorn/unicorntest/unicorntest.c ---- unicorn.orig/unicorntest/unicorntest.c 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/unicorntest/unicorntest.c 2006-12-20 20:56:25.000000000 +0200 +Index: unicorn-0.9.3/unicorntest/unicorntest.c +=================================================================== +--- unicorn-0.9.3.orig/unicorntest/unicorntest.c 2008-10-10 16:24:05.000000000 +0200 ++++ unicorn-0.9.3/unicorntest/unicorntest.c 2008-10-10 16:58:38.000000000 +0200 @@ -540,10 +540,10 @@ printf(" ----------------------------------------------------------\n\n"); } @@ -485,9 +297,10 @@ int i; if (strcmp(cmd,"HELP") == 0) -diff -Nru unicorn.orig/unicorn_usb/unicorn_usbdrv.c unicorn/unicorn_usb/unicorn_usbdrv.c ---- unicorn.orig/unicorn_usb/unicorn_usbdrv.c 2006-12-20 20:58:11.000000000 +0200 -+++ unicorn/unicorn_usb/unicorn_usbdrv.c 2006-12-20 21:00:06.000000000 +0200 +Index: unicorn-0.9.3/unicorn_usb/unicorn_usbdrv.c +=================================================================== +--- unicorn-0.9.3.orig/unicorn_usb/unicorn_usbdrv.c 2008-10-10 16:24:05.000000000 +0200 ++++ unicorn-0.9.3/unicorn_usb/unicorn_usbdrv.c 2008-10-10 16:58:38.000000000 +0200 @@ -4,8 +4,10 @@ Analog Front End (AFE). This file contains the USB specific routines. reverted: --- unicorn-0.9.3/adsl_status/src/Makefile +++ unicorn-0.9.3.orig/adsl_status/src/Makefile @@ -16,7 +16,7 @@ srcdir = . top_srcdir = .. +prefix = /usr/local -prefix = /usr exec_prefix = ${prefix} bindir = ${exec_prefix}/bin @@ -66,9 +66,9 @@ GENCAT = gencat GLIBC21 = yes GMSGFMT = /usr/bin/msgfmt +GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include GTK_CONFIG = /usr/bin/gtk-config +GTK_LIBS = -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm -GTK_LIBS = -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = .mo INTLBISON = bison @@ -90,7 +90,7 @@ USE_NLS = yes VERSION = 0.1 +INCLUDES = -I../../amu -I../../include/ -I$(top_srcdir)/intl -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -INCLUDES = -I../../amu -I../../include/ -I$(top_srcdir)/intl -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include bin_PROGRAMS = bewan_adsl_status @@ -98,7 +98,7 @@ bewan_adsl_status_SOURCES = main.c support.c support.h interface.c interface.h callbacks.c callbacks.h status.h status.c +bewan_adsl_status_LDADD = -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm $(INTLLIBS) -bewan_adsl_status_LDADD = -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm $(INTLLIBS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = reverted: --- unicorn-0.9.3/adsl_status/config.h +++ unicorn-0.9.3.orig/adsl_status/config.h @@ -47,9 +47,9 @@ #define HAVE_LC_MESSAGES 1 #define HAVE_STPCPY 1 /* #undef HAVE_LIBSM */ +#define PACKAGE_LOCALE_DIR "/usr/local/share/locale" +#define PACKAGE_DATA_DIR "/usr/local/share/bewan_adsl_status" +#define PACKAGE_SOURCE_DIR "/home/fisaksen/src/unicorn/adsl_status" -#define PACKAGE_LOCALE_DIR "/usr/share/locale" -#define PACKAGE_DATA_DIR "/usr/share/bewan_adsl_status" -#define PACKAGE_SOURCE_DIR "/local/home/rzr/home/src/debian/unicorn-0.9.3/adsl_status" /* Define if you have the __argz_count function. */ #define HAVE___ARGZ_COUNT 1 reverted: --- unicorn-0.9.3/adsl_status/po/Makefile +++ unicorn-0.9.3.orig/adsl_status/po/Makefile @@ -18,7 +18,7 @@ srcdir = . top_srcdir = .. +prefix = /usr/local -prefix = /usr exec_prefix = ${prefix} datadir = ${prefix}/share localedir = $(datadir)/locale reverted: --- unicorn-0.9.3/adsl_status/po/Makefile.in +++ unicorn-0.9.3.orig/adsl_status/po/Makefile.in @@ -18,7 +18,7 @@ srcdir = . top_srcdir = .. +prefix = /usr/local -prefix = /usr exec_prefix = ${prefix} datadir = ${prefix}/share localedir = $(datadir)/locale reverted: --- unicorn-0.9.3/adsl_status/config.status +++ unicorn-0.9.3.orig/adsl_status/config.status @@ -2,9 +2,9 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, +# on host moutons: -# on host nrv: # +# ./configure -# ./configure --prefix=/usr # # Compiler output produced by configure, useful for debugging # configure, is in ./config.log if it exists. @@ -14,8 +14,8 @@ do case "$ac_option" in -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion" + exec ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion ;; - echo "running ${CONFIG_SHELL-/bin/sh} ./configure --prefix=/usr --no-create --no-recursion" - exec ${CONFIG_SHELL-/bin/sh} ./configure --prefix=/usr --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) echo "./config.status generated by autoconf version 2.13" exit 0 ;; @@ -49,7 +49,7 @@ s%@LDFLAGS@%%g s%@LIBS@%%g s%@exec_prefix@%${prefix}%g +s%@prefix@%/usr/local%g -s%@prefix@%/usr%g s%@program_transform_name@%s,x,x,%g s%@bindir@%${exec_prefix}/bin%g s%@sbindir@%${exec_prefix}/sbin%g @@ -77,8 +77,8 @@ s%@CC@%gcc%g s%@CPP@%gcc -E%g s%@GTK_CONFIG@%/usr/bin/gtk-config%g +s%@GTK_CFLAGS@%-I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include%g +s%@GTK_LIBS@%-L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm%g -s%@GTK_CFLAGS@%-I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include%g -s%@GTK_LIBS@%-L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm%g s%@MKINSTALLDIRS@%./mkinstalldirs%g s%@MSGFMT@%/usr/bin/msgfmt%g s%@GMSGFMT@%/usr/bin/msgfmt%g @@ -467,21 +467,21 @@ ${ac_dA}HAVE_DCGETTEXT${ac_dB}HAVE_DCGETTEXT${ac_dC}1${ac_dD} ${ac_uA}HAVE_DCGETTEXT${ac_uB}HAVE_DCGETTEXT${ac_uC}1${ac_uD} ${ac_eA}HAVE_DCGETTEXT${ac_eB}HAVE_DCGETTEXT${ac_eC}1${ac_eD} +${ac_dA}PACKAGE_LOCALE_DIR${ac_dB}PACKAGE_LOCALE_DIR${ac_dC}"/usr/local/share/locale"${ac_dD} +${ac_uA}PACKAGE_LOCALE_DIR${ac_uB}PACKAGE_LOCALE_DIR${ac_uC}"/usr/local/share/locale"${ac_uD} +${ac_eA}PACKAGE_LOCALE_DIR${ac_eB}PACKAGE_LOCALE_DIR${ac_eC}"/usr/local/share/locale"${ac_eD} -${ac_dA}PACKAGE_LOCALE_DIR${ac_dB}PACKAGE_LOCALE_DIR${ac_dC}"/usr/share/locale"${ac_dD} -${ac_uA}PACKAGE_LOCALE_DIR${ac_uB}PACKAGE_LOCALE_DIR${ac_uC}"/usr/share/locale"${ac_uD} -${ac_eA}PACKAGE_LOCALE_DIR${ac_eB}PACKAGE_LOCALE_DIR${ac_eC}"/usr/share/locale"${ac_eD} CEOF sed -f conftest.frag conftest.in > conftest.out rm -f conftest.in mv conftest.out conftest.in cat > conftest.frag < conftest.out reverted: --- unicorn-0.9.3/adsl_status/config.log +++ unicorn-0.9.3.orig/adsl_status/config.log @@ -2,7 +2,7 @@ running configure, to aid debugging if configure makes a mistake. configure:589: checking for non-GNU ld +configure:624: checking if the linker (/usr/bin/ld) is GNU ld -configure:624: checking if the linker (/usr/bin/X11/ld) is GNU ld configure:673: checking for a BSD compatible install configure:726: checking whether build environment is sane configure:783: checking whether make sets ${MAKE} @@ -15,3 +15,75 @@ configure:944: checking for gcc configure:1057: checking whether the C compiler (gcc ) works configure:1073: gcc -o conftest conftest.c 1>&5 +configure:1099: checking whether the C compiler (gcc ) is a cross-compiler +configure:1104: checking whether we are using GNU C +configure:1132: checking whether gcc accepts -g +configure:1167: checking for gcc option to accept ANSI C +configure:1244: checking how to run the C preprocessor +configure:1324: checking for ANSI C header files +configure:1478: checking for gtk-config +configure:1513: checking for GTK - version >= 1.2.0 +configure:1614: gcc -o conftest -g -O2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include conftest.c -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm 1>&5 +configure:1700: checking for inttypes.h +configure:1735: checking for stdint.h +configure:1770: checking for unsigned long long +configure:1821: checking for shared library run path origin +configure:1870: checking host system type +configure:1893: checking for ranlib +configure:1921: checking for working const +configure:1996: checking for inline +configure:2036: checking for off_t +configure:2069: checking for size_t +configure:2104: checking for working alloca.h +configure:2137: checking for alloca +configure:2339: checking for unistd.h +configure:2378: checking for getpagesize +configure:2431: checking for working mmap +configure:2603: checking whether we are using the GNU C Library 2.1 or newer +configure:2641: checking whether integer division by zero raises SIGFPE +configure:2739: checking for inttypes.h +configure:2778: checking whether the inttypes.h PRIxNN macros are broken +configure:3206: checking for msgfmt +configure:3241: checking for gmsgfmt +configure:3278: checking for xgettext +configure:3315: checking for msgmerge +configure:3378: checking for argz.h +configure:3378: checking for limits.h +configure:3378: checking for locale.h +configure:3378: checking for nl_types.h +configure:3378: checking for malloc.h +configure:3378: checking for stddef.h +configure:3378: checking for stdlib.h +configure:3378: checking for string.h +configure:3378: checking for unistd.h +configure:3378: checking for sys/param.h +configure:3419: checking for feof_unlocked +configure:3419: checking for fgets_unlocked +configure:3419: checking for getc_unlocked +configure:3419: checking for getcwd +configure:3419: checking for getegid +configure:3419: checking for geteuid +configure:3419: checking for getgid +configure:3419: checking for getuid +configure:3419: checking for mempcpy +configure:3419: checking for munmap +configure:3419: checking for putenv +configure:3419: checking for setenv +configure:3419: checking for setlocale +configure:3419: checking for stpcpy +configure:3419: checking for strcasecmp +configure:3419: checking for strdup +configure:3419: checking for strtoul +configure:3419: checking for tsearch +configure:3419: checking for __argz_count +configure:3419: checking for __argz_stringify +configure:3419: checking for __argz_next +configure:3503: checking for iconv +configure:3578: checking for iconv declaration +configure:3627: checking for nl_langinfo and CODESET +configure:3663: checking for LC_MESSAGES +configure:3702: checking for bison +configure:3735: checking version of bison +configure:3764: checking whether NLS is requested +configure:3788: checking whether included gettext is requested +configure:3808: checking for GNU gettext in libc reverted: --- unicorn-0.9.3/adsl_status/config.cache +++ unicorn-0.9.3.orig/adsl_status/config.cache @@ -75,7 +75,7 @@ acl_cv_hardcode_libdir_separator=${acl_cv_hardcode_libdir_separator=} acl_cv_hardcode_minus_L=${acl_cv_hardcode_minus_L=no} acl_cv_libext=${acl_cv_libext=a} +acl_cv_path_LD=${acl_cv_path_LD=/usr/bin/ld} -acl_cv_path_LD=${acl_cv_path_LD=/usr/bin/X11/ld} acl_cv_prog_gnu_ld=${acl_cv_prog_gnu_ld=yes} acl_cv_rpath=${acl_cv_rpath=done} acl_cv_shlibext=${acl_cv_shlibext=} reverted: --- unicorn-0.9.3/adsl_status/Makefile +++ unicorn-0.9.3.orig/adsl_status/Makefile @@ -16,7 +16,7 @@ srcdir = . top_srcdir = . +prefix = /usr/local -prefix = /usr exec_prefix = ${prefix} bindir = ${exec_prefix}/bin @@ -66,9 +66,9 @@ GENCAT = gencat GLIBC21 = yes GMSGFMT = /usr/bin/msgfmt +GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include GTK_CONFIG = /usr/bin/gtk-config +GTK_LIBS = -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm -GTK_LIBS = -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = .mo INTLBISON = bison reverted: --- unicorn-0.9.3/adsl_status/intl/Makefile +++ unicorn-0.9.3.orig/adsl_status/intl/Makefile @@ -26,7 +26,7 @@ top_srcdir = .. top_builddir = .. +prefix = /usr/local -prefix = /usr exec_prefix = ${prefix} transform = s,x,x, libdir = ${exec_prefix}/lib reverted: --- unicorn-0.9.3/adsl_status/m4/Makefile +++ unicorn-0.9.3.orig/adsl_status/m4/Makefile @@ -16,7 +16,7 @@ srcdir = . top_srcdir = .. +prefix = /usr/local -prefix = /usr exec_prefix = ${prefix} bindir = ${exec_prefix}/bin @@ -66,9 +66,9 @@ GENCAT = gencat GLIBC21 = yes GMSGFMT = /usr/bin/msgfmt +GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include GTK_CONFIG = /usr/bin/gtk-config +GTK_LIBS = -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm -GTK_LIBS = -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = .mo INTLBISON = bison only in patch2: unchanged: --- unicorn-0.9.3.orig/debian/patches/01-debian-unicorn-shirq.patch +++ unicorn-0.9.3/debian/patches/01-debian-unicorn-shirq.patch @@ -0,0 +1,16 @@ +Index: unicorn/unicorn_pci/unicorn_pcidrv.c +=================================================================== +--- unicorn.orig/unicorn_pci/unicorn_pcidrv.c 2008-08-07 12:39:04.000000000 +0100 ++++ unicorn/unicorn_pci/unicorn_pcidrv.c 2008-08-07 12:39:42.000000000 +0100 +@@ -992,7 +992,11 @@ + phys_base,dev->mem,dev->mem_size); + + // Initialize and connect the interrupt ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + status = request_irq(pci_dev->irq, unicorn_isr, SA_SHIRQ, "unicorn_pci", dev); ++#else ++ status = request_irq(pci_dev->irq, unicorn_isr, IRQF_SHARED, "unicorn_pci", dev); ++#endif + if (status) { + WARN("Failed to connect Interrupt,status=%d\n",status); + return status; only in patch2: unchanged: --- unicorn-0.9.3.orig/debian/patches/02-debian-unicorn-usbdrv.patch +++ unicorn-0.9.3/debian/patches/02-debian-unicorn-usbdrv.patch @@ -0,0 +1,14 @@ +Index: unicorn/unicorn_usb/unicorn_usbdrv.c +=================================================================== +--- unicorn.orig/unicorn_usb/unicorn_usbdrv.c 2008-08-07 12:36:13.000000000 +0100 ++++ unicorn/unicorn_usb/unicorn_usbdrv.c 2008-08-07 12:36:16.000000000 +0100 +@@ -148,7 +148,9 @@ + unsigned int pipe, void *buf, int length, int packet_size, usb_complete_t complete, + void *context) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + spin_lock_init(&urb->lock); ++#endif + urb->dev=dev; + urb->pipe=pipe; + urb->transfer_buffer=buf; only in patch2: unchanged: --- unicorn-0.9.3.orig/debian/patches/03-debian-unicorn-ethdrv.patch +++ unicorn-0.9.3/debian/patches/03-debian-unicorn-ethdrv.patch @@ -0,0 +1,14 @@ +Index: unicorn/unicorn_eth/unicorn_ethdrv.c +=================================================================== +--- unicorn.orig/unicorn_eth/unicorn_ethdrv.c 2008-08-07 12:47:19.000000000 +0100 ++++ unicorn/unicorn_eth/unicorn_ethdrv.c 2008-08-07 12:47:22.000000000 +0100 +@@ -1391,7 +1391,9 @@ + } + unicorn_ethdrv = drv = eth_dev->priv; + memset(drv, 0, sizeof(struct unicorn_ethdrv)); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + SET_MODULE_OWNER(eth_dev); ++#endif + drv->dev = eth_dev; + drv->adsl_status = ADSL_STATUS_NOHARDWARE; + drv->vpi = VPI; only in patch2: unchanged: --- unicorn-0.9.3.orig/debian/patches/bewan-adsl-0.9.3-linux-2.6.26.patch +++ unicorn-0.9.3/debian/patches/bewan-adsl-0.9.3-linux-2.6.26.patch @@ -0,0 +1,73 @@ +Index: unicorn-0.9.3/unicorn_usb/Makefile +=================================================================== +--- unicorn-0.9.3.orig/unicorn_usb/Makefile 2008-10-11 01:24:27.000000000 +0200 ++++ unicorn-0.9.3/unicorn_usb/Makefile 2008-10-11 01:24:56.000000000 +0200 +@@ -43,6 +43,7 @@ + OBJS = unicorn_usbdrv.o ../msw/linrapi.o ../msw/msw.o ../msw/crc.o ../amu/amas.o ../amu/amu.o ../amu/bsp_usb.o + OBJS_ATM = ../unicorn_atm/unicorn_atmdrv.o + OBJS_ETH = ../unicorn_eth/unicorn_ethdrv.o ++OBJS_CXX=../msw/msw.o ../amu/amas.o ../amu/amu.o ../amu/bsp_usb.o + MODEM_LIB = $(src)/../arch/i386/modem_ant_USB_LINUX.o + LIBM = $(src)/../libm/libm.a + +@@ -52,7 +53,7 @@ + modules_install: install_atm install_eth + else + # kernel 2.6, use kernel build process +-modules: ++modules: ${OBJS_CXX} + make CC=$(CC) -C $(KERNEL_SOURCES) SUBDIRS=$(MODDIR) modules + modules_install: + make CC=$(CC) -C $(KERNEL_SOURCES) SUBDIRS=$(MODDIR) modules_install +Index: unicorn-0.9.3/unicorn_pci/Makefile +=================================================================== +--- unicorn-0.9.3.orig/unicorn_pci/Makefile 2008-10-11 01:24:27.000000000 +0200 ++++ unicorn-0.9.3/unicorn_pci/Makefile 2008-10-11 01:24:27.000000000 +0200 +@@ -47,6 +47,8 @@ + OBJS = unicorn_pcidrv.o ../msw/linrapi.o ../msw/msw.o ../msw/crc.o ../amu/amas.o ../amu/amu.o ../amu/bsp_pci.o + OBJS_ATM = ../unicorn_atm/unicorn_atmdrv.o + OBJS_ETH = ../unicorn_eth/unicorn_ethdrv.o ++OBJS_CXX=../msw/msw.o ../amu/amas.o ../amu/amu.o ../amu/bsp_pci.o ++ + ifdef CONFIG_REGPARM + MODEM_LIB = $(src)/../arch/i386/modem_ant_PCI_LINUX.o.regparm3 + else +@@ -60,8 +62,8 @@ + modules_install: install_atm install_eth + else + # kernel 2.6, use kernel build process +-modules: +- make CC=$(CC) -C $(KERNEL_SOURCES) SUBDIRS=$(MODDIR) modules ++modules: ${OBJS_CXX} ++ make CC=$(CC) -C $(KERNEL_SOURCES) SUBDIRS=$(MODDIR) modules KBUILD_VERBOSE=1 + modules_install: + make CC=$(CC) -C $(KERNEL_SOURCES) SUBDIRS=$(MODDIR) modules_install + endif +Index: unicorn-0.9.3/msw/msw.cpp +=================================================================== +--- unicorn-0.9.3.orig/msw/msw.cpp 2008-10-11 01:22:03.000000000 +0200 ++++ unicorn-0.9.3/msw/msw.cpp 2008-10-11 01:24:27.000000000 +0200 +@@ -27,7 +27,7 @@ + extern bool L3_flag; + extern unsigned long GlobalRemove; + +-#if 1 ++#if ! defined(__cplusplus) //#~rzr + extern void *operator new(size_t size) + { + void *ptr; +Index: unicorn-0.9.3/include/rapi.h +=================================================================== +--- unicorn-0.9.3.orig/include/rapi.h 2008-10-11 01:22:03.000000000 +0200 ++++ unicorn-0.9.3/include/rapi.h 2008-10-11 01:24:27.000000000 +0200 +@@ -11,6 +11,10 @@ + #ifndef __rapi__h_ + #define __rapi__h_ + ++#ifndef DWORD ++# define DWORK int ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif