summaryrefslogtreecommitdiffstats
path: root/patches/CanFestival-3-20081204-1
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2008-12-04 14:43:28 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2008-12-04 14:43:28 +0000
commit95d2529cb79cc01992bc1d5cea903ebbb35e7ac5 (patch)
tree17aafcf1e15700fa4be6775910481c2c32477894 /patches/CanFestival-3-20081204-1
parent46f9b9c054fcfd3c46b78324a53604f72fe24c5d (diff)
downloadptxdist-95d2529cb79cc01992bc1d5cea903ebbb35e7ac5.tar.gz
ptxdist-95d2529cb79cc01992bc1d5cea903ebbb35e7ac5.tar.xz
* canfestival: add patches (from mme)
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9187 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/CanFestival-3-20081204-1')
-rw-r--r--patches/CanFestival-3-20081204-1/generic/byteorder.diff275
-rw-r--r--patches/CanFestival-3-20081204-1/generic/fix-destdir.diff144
-rw-r--r--patches/CanFestival-3-20081204-1/generic/fix-ldconfig.diff13
-rw-r--r--patches/CanFestival-3-20081204-1/generic/install-networkedit_ico.diff13
-rw-r--r--patches/CanFestival-3-20081204-1/generic/series4
5 files changed, 449 insertions, 0 deletions
diff --git a/patches/CanFestival-3-20081204-1/generic/byteorder.diff b/patches/CanFestival-3-20081204-1/generic/byteorder.diff
new file mode 100644
index 000000000..2c0aece08
--- /dev/null
+++ b/patches/CanFestival-3-20081204-1/generic/byteorder.diff
@@ -0,0 +1,275 @@
+Index: CanFestival-3-20080926/src/nmtMaster.c
+===================================================================
+--- CanFestival-3-20080926.orig/src/nmtMaster.c 2008-01-25 19:01:58.000000000 +0100
++++ CanFestival-3-20080926/src/nmtMaster.c 2008-09-30 16:07:54.000000000 +0200
+@@ -74,7 +74,7 @@
+
+ /* message configuration */
+ UNS16 tmp = nodeId | (NODE_GUARD << 7);
+- m.cob_id = UNS16_LE(tmp);
++ m.cob_id = tmp;
+ m.rtr = REQUEST;
+ m.len = 1;
+
+Index: CanFestival-3-20080926/src/lifegrd.c
+===================================================================
+--- CanFestival-3-20080926.orig/src/lifegrd.c 2008-09-30 16:09:57.000000000 +0200
++++ CanFestival-3-20080926/src/lifegrd.c 2008-09-30 16:10:14.000000000 +0200
+@@ -103,7 +103,7 @@
+ {
+ Message msg;
+ UNS16 tmp = *d->bDeviceNodeId + 0x700;
+- msg.cob_id = UNS16_LE(tmp);
++ msg.cob_id = tmp;
+ msg.len = (UNS8)0x01;
+ msg.rtr = 0;
+ msg.data[0] = d->nodeState;
+@@ -180,7 +180,7 @@
+ ** the node-id of this device.
+ */
+ UNS16 tmp = *d->bDeviceNodeId + 0x700;
+- msg.cob_id = UNS16_LE(tmp);
++ msg.cob_id = tmp;
+ msg.len = (UNS8)0x01;
+ msg.rtr = 0;
+ msg.data[0] = d->nodeState; /* No toggle for heartbeat !*/
+Index: CanFestival-3-20080926/src/nmtSlave.c
+===================================================================
+--- CanFestival-3-20080926.orig/src/nmtSlave.c 2008-09-30 16:12:04.000000000 +0200
++++ CanFestival-3-20080926/src/nmtSlave.c 2008-09-30 16:12:13.000000000 +0200
+@@ -128,7 +128,7 @@
+ /* message configuration */
+ {
+ UNS16 tmp = NODE_GUARD << 7 | *d->bDeviceNodeId;
+- m.cob_id = UNS16_LE(tmp);
++ m.cob_id = tmp;
+ }
+ m.rtr = NOT_A_REQUEST;
+ m.len = 1;
+Index: CanFestival-3-20080926/src/pdo.c
+===================================================================
+--- CanFestival-3-20080926.orig/src/pdo.c 2008-09-30 16:10:42.000000000 +0200
++++ CanFestival-3-20080926/src/pdo.c 2008-09-30 16:17:34.000000000 +0200
+@@ -57,7 +57,7 @@
+ UNS8 offset = 0x00;
+ const UNS8 *pMappingCount = (UNS8 *) TPDO_map->pSubindex[0].pObject;
+
+- pdo->cob_id = UNS16_LE(*(UNS32*)TPDO_com->pSubindex[1].pObject & 0x7FF);
++ pdo->cob_id = *(UNS32*)TPDO_com->pSubindex[1].pObject & 0x7FF;
+ pdo->rtr = NOT_A_REQUEST;
+
+ MSG_WAR (0x3009, " PDO CobId is : ",
+@@ -143,7 +143,7 @@
+ MSG_WAR (0x3930, "sendPDOrequest cobId is : ", *pwCobId);
+ {
+ Message pdo;
+- pdo.cob_id = UNS16_LE(*pwCobId);
++ pdo.cob_id = *pwCobId;
+ pdo.rtr = REQUEST;
+ pdo.len = 0;
+ return canSend (d->canHandle, &pdo);
+@@ -186,7 +186,7 @@
+
+ status = state2;
+
+- MSG_WAR (0x3935, "proceedPDO, cobID : ", (UNS16_LE(m->cob_id) & 0x7ff));
++ MSG_WAR (0x3935, "proceedPDO, cobID : ", (m->cob_id & 0x7ff));
+ offset = 0x00;
+ numPdo = 0;
+ numMap = 0;
+@@ -213,7 +213,7 @@
+ /* check the CobId coherance */
+ /*pwCobId is the cobId read in the dictionary at the state 3
+ */
+- if (*pwCobId == UNS16_LE(m->cob_id))
++ if (*pwCobId == m->cob_id)
+ {
+ /* The cobId is recognized */
+ status = state4;
+@@ -291,7 +291,7 @@
+
+ MSG_WAR (0x3942,
+ "Variable updated by PDO cobid : ",
+- UNS16_LE(m->cob_id));
++ m->cob_id);
+ MSG_WAR (0x3943, " Mapped at index : ",
+ (*pMappingParameter) >> 16);
+ MSG_WAR (0x3944, " subindex : ",
+@@ -308,7 +308,7 @@
+ } /* end if Donnees */
+ else if ((*m).rtr == REQUEST)
+ {
+- MSG_WAR (0x3946, "Receive a PDO request cobId : ", UNS16_LE(m->cob_id));
++ MSG_WAR (0x3946, "Receive a PDO request cobId : ", m->cob_id);
+ status = state1;
+ offsetObjdict = d->firstIndex->PDO_TRS;
+ lastIndex = d->lastIndex->PDO_TRS;
+@@ -326,7 +326,7 @@
+ pwCobId =
+ (d->objdict +
+ offsetObjdict)->pSubindex[1].pObject;
+- if (*pwCobId == UNS16_LE(m->cob_id))
++ if (*pwCobId == m->cob_id)
+ {
+ status = state4;
+ break;
+@@ -366,7 +366,7 @@
+ /* DS301 do not tell what to do in such a case... */
+ MSG_ERR (0x1947,
+ "Not ready RTR_SYNC TPDO send current data : ",
+- UNS16_LE(m->cob_id));
++ m->cob_id);
+ status = state5;
+ }
+ break;
+@@ -391,7 +391,7 @@
+ /* The requested PDO is not to send on request. So, does
+ nothing. */
+ MSG_WAR (0x2947, "PDO is not to send on request : ",
+- UNS16_LE(m->cob_id));
++ m->cob_id);
+ return 0xFF;
+ }
+
+@@ -692,7 +692,7 @@
+ case state5: /*Send the pdo */
+ /*store_as_last_message */
+ d->PDO_status[pdoNum].last_message = pdo;
+- MSG_WAR (0x396D, "sendPDO cobId :", UNS16_LE(pdo.cob_id));
++ MSG_WAR (0x396D, "sendPDO cobId :", pdo.cob_id);
+ MSG_WAR (0x396E, " Nb octets : ", pdo.len);
+
+ canSend (d->canHandle, &pdo);
+Index: CanFestival-3-20080926/src/sdo.c
+===================================================================
+--- CanFestival-3-20080926.orig/src/sdo.c 2008-09-30 16:10:20.000000000 +0200
++++ CanFestival-3-20080926/src/sdo.c 2008-09-30 16:13:29.000000000 +0200
+@@ -547,7 +547,7 @@
+ pwCobId = (UNS32*) d->objdict[offset].pSubindex[1].pObject;
+ }
+ /* message copy for sending */
+- m.cob_id = UNS16_LE(*pwCobId);
++ m.cob_id = *pwCobId;
+ m.rtr = NOT_A_REQUEST;
+ /* the length of SDO must be 8 */
+ m.len = 8;
+@@ -640,7 +640,7 @@
+ return 0xFF;
+ }
+ pCobId = (UNS32*) d->objdict[offset].pSubindex[1].pObject;
+- if ( *pCobId == UNS16_LE(m->cob_id) ) {
++ if ( *pCobId == m->cob_id ) {
+ whoami = SDO_SERVER;
+ MSG_WAR(0x3A62, "proceedSDO. I am server. index : ", 0x1200 + j);
+ /* In case of server, the node id of the client may be unknown. So we put the index minus offset */
+@@ -663,7 +663,7 @@
+ }
+ /* a) Looking for the cobid received. */
+ pCobId = (UNS32*) d->objdict[offset].pSubindex[2].pObject;
+- if (*pCobId == UNS16_LE(m->cob_id) ) {
++ if (*pCobId == m->cob_id ) {
+ /* b) cobid found, so reading the node id of the server. */
+ pNodeId = (UNS8*) d->objdict[offset].pSubindex[3].pObject;
+ whoami = SDO_CLIENT;
+@@ -682,7 +682,7 @@
+
+ /* Test if the size of the SDO is ok */
+ if ( (*m).len != 8) {
+- MSG_ERR(0x1A67, "Error size SDO. CobId : ", UNS16_LE(m->cob_id));
++ MSG_ERR(0x1A67, "Error size SDO. CobId : ", m->cob_id);
+ failedSDO(d, nodeId, whoami, 0, 0, SDOABT_GENERAL_ERROR);
+ return 0xFF;
+ }
+@@ -691,7 +691,7 @@
+ MSG_WAR(0x3A68, "I am CLIENT. Received SDO from nodeId : ", nodeId);
+ }
+ else {
+- MSG_WAR(0x3A69, "I am SERVER. Received SDO cobId : ", UNS16_LE(m->cob_id));
++ MSG_WAR(0x3A69, "I am SERVER. Received SDO cobId : ", m->cob_id);
+ }
+
+ /* Testing the command specifier */
+Index: CanFestival-3-20080926/src/states.c
+===================================================================
+--- CanFestival-3-20080926.orig/src/states.c 2008-09-30 16:11:21.000000000 +0200
++++ CanFestival-3-20080926/src/states.c 2008-09-30 16:11:56.000000000 +0200
+@@ -62,7 +62,7 @@
+ **/
+ void canDispatch(CO_Data* d, Message *m)
+ {
+- UNS16 cob_id = UNS16_LE(m->cob_id);
++ UNS16 cob_id = m->cob_id;
+ switch(cob_id >> 7)
+ {
+ case SYNC: /* can be a SYNC or a EMCY message */
+Index: CanFestival-3-20080926/src/sync.c
+===================================================================
+--- CanFestival-3-20080926.orig/src/sync.c 2008-09-30 16:11:08.000000000 +0200
++++ CanFestival-3-20080926/src/sync.c 2008-09-30 16:11:16.000000000 +0200
+@@ -131,7 +131,7 @@
+
+ MSG_WAR(0x3001, "sendSYNC ", 0);
+
+- m.cob_id = UNS16_LE(*d->COB_ID_Sync);
++ m.cob_id = *d->COB_ID_Sync;
+ m.rtr = NOT_A_REQUEST;
+ m.len = 0;
+
+Index: CanFestival-3-20080926/src/emcy.c
+===================================================================
+--- CanFestival-3-20080926.orig/src/emcy.c 2008-09-30 16:15:26.000000000 +0200
++++ CanFestival-3-20080926/src/emcy.c 2008-09-30 16:16:00.000000000 +0200
+@@ -101,7 +101,7 @@
+
+ MSG_WAR(0x3051, "sendEMCY", 0);
+
+- m.cob_id = UNS16_LE(*(UNS32*)d->error_cobid);
++ m.cob_id = *(UNS32*)d->error_cobid;
+ m.rtr = NOT_A_REQUEST;
+ m.len = 8;
+ m.data[0] = errCode & 0xFF; /* LSB */
+@@ -239,7 +239,7 @@
+ }
+
+ /* post the received EMCY */
+- nodeID = UNS16_LE(m->cob_id) & 0x7F;
++ nodeID = m->cob_id & 0x7F;
+ errCode = m->data[0] | ((UNS16)m->data[1] << 8);
+ errReg = m->data[2];
+ (*d->post_emcy)(d, nodeID, errCode, errReg);
+Index: CanFestival-3-20080926/src/lss.c
+===================================================================
+--- CanFestival-3-20080926.orig/src/lss.c 2008-09-30 16:16:12.000000000 +0200
++++ CanFestival-3-20080926/src/lss.c 2008-09-30 16:16:34.000000000 +0200
+@@ -330,7 +330,7 @@
+ m.len = 8;
+ m.rtr = NOT_A_REQUEST;
+ m.data[0]=command;
+- m.cob_id=UNS16_LE(SLSS_ADRESS);
++ m.cob_id=SLSS_ADRESS;
+
+ /* Tha data sent with the msg depends on the command */
+ switch(command){
+@@ -397,7 +397,7 @@
+ m.len = 8;
+ m.rtr = NOT_A_REQUEST;
+ m.data[0]=command;
+- m.cob_id=UNS16_LE(MLSS_ADRESS);
++ m.cob_id=MLSS_ADRESS;
+
+ /* Tha data sent with the msg depends on the command */
+ switch(command){
+Index: CanFestival-3-20080926/include/objdictdef.h
+===================================================================
+--- CanFestival-3-20080926.orig/include/objdictdef.h 2008-09-30 16:17:53.000000000 +0200
++++ CanFestival-3-20080926/include/objdictdef.h 2008-09-30 16:18:09.000000000 +0200
+@@ -118,7 +118,7 @@
+ /************************** MACROS *********************************/
+
+ /* CANopen usefull helpers */
+-#define GET_NODE_ID(m) (UNS16_LE(m.cob_id) & 0x7f)
+-#define GET_FUNCTION_CODE(m) (UNS16_LE(m.cob_id) >> 7)
++#define GET_NODE_ID(m) (m.cob_id & 0x7f)
++#define GET_FUNCTION_CODE(m) (m.cob_id >> 7)
+
+ #endif /* __objdictdef_h__ */
diff --git a/patches/CanFestival-3-20081204-1/generic/fix-destdir.diff b/patches/CanFestival-3-20081204-1/generic/fix-destdir.diff
new file mode 100644
index 000000000..1073be584
--- /dev/null
+++ b/patches/CanFestival-3-20081204-1/generic/fix-destdir.diff
@@ -0,0 +1,144 @@
+Index: CanFestival-3-20080926/drivers/timers_unix/Makefile.in
+===================================================================
+--- CanFestival-3-20080926.orig/drivers/timers_unix/Makefile.in 2008-09-26 12:22:50.000000000 +0200
++++ CanFestival-3-20080926/drivers/timers_unix/Makefile.in 2008-09-26 12:22:53.000000000 +0200
+@@ -48,8 +48,8 @@
+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
+
+ install:
+- mkdir -p $(PREFIX)/include/canfestival
+- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -f $(TARGET_HFILES)
+Index: CanFestival-3-20080926/drivers/can_socket/Makefile.in
+===================================================================
+--- CanFestival-3-20080926.orig/drivers/can_socket/Makefile.in 2008-09-26 12:22:50.000000000 +0200
++++ CanFestival-3-20080926/drivers/can_socket/Makefile.in 2008-09-26 12:22:53.000000000 +0200
+@@ -56,8 +56,8 @@
+ $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+Index: CanFestival-3-20080926/drivers/unix/Makefile.in
+===================================================================
+--- CanFestival-3-20080926.orig/drivers/unix/Makefile.in 2008-09-26 12:22:50.000000000 +0200
++++ CanFestival-3-20080926/drivers/unix/Makefile.in 2008-09-26 12:22:53.000000000 +0200
+@@ -97,10 +97,10 @@
+ $(BINUTILS_PREFIX)ranlib $@
+
+ install: libcanfestival_$(TARGET).a
+- mkdir -p $(PREFIX)/lib/
+- mkdir -p $(PREFIX)/include/canfestival
+- cp libcanfestival_$(TARGET).a $(PREFIX)/lib/
+- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp libcanfestival_$(TARGET).a $(DESTDIR)$(PREFIX)/lib/
++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -f $(PREFIX)/lib/libcanfestival_$(TARGET).a
+Index: CanFestival-3-20080926/src/Makefile.in
+===================================================================
+--- CanFestival-3-20080926.orig/src/Makefile.in 2008-09-26 12:22:50.000000000 +0200
++++ CanFestival-3-20080926/src/Makefile.in 2008-09-26 12:22:53.000000000 +0200
+@@ -87,8 +87,8 @@
+
+ install:
+ $(MAKE) -C $(KERNELDIR) M=$(shell pwd) modules_install
+- mkdir -p $(PREFIX)/include/canfestival
+- cp ../include/*.h $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -rf $(PREFIX)/include/canfestival
+@@ -114,10 +114,10 @@
+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
+
+ install: libcanfestival.a
+- mkdir -p $(PREFIX)/lib/
+- mkdir -p $(PREFIX)/include/canfestival
+- cp libcanfestival.a $(PREFIX)/lib/
+- cp ../include/*.h $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp libcanfestival.a $(DESTDIR)$(PREFIX)/lib/
++ cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -f $(PREFIX)/lib/libcanfestival.a
+Index: CanFestival-3-20080926/examples/TestMasterSlave/Makefile.in
+===================================================================
+--- CanFestival-3-20080926.orig/examples/TestMasterSlave/Makefile.in 2008-09-26 12:22:50.000000000 +0200
++++ CanFestival-3-20080926/examples/TestMasterSlave/Makefile.in 2008-09-26 12:22:53.000000000 +0200
+@@ -87,8 +87,8 @@
+ rm -f TestMaster.c
+
+ install: TestMasterSlave
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+ rm -f $(PREFIX)/bin/TestMasterSlave
+Index: CanFestival-3-20080926/examples/TestMasterMicroMod/Makefile.in
+===================================================================
+--- CanFestival-3-20080926.orig/examples/TestMasterMicroMod/Makefile.in 2008-09-26 12:22:50.000000000 +0200
++++ CanFestival-3-20080926/examples/TestMasterMicroMod/Makefile.in 2008-09-26 12:22:53.000000000 +0200
+@@ -74,8 +74,8 @@
+ rm -f TestMaster.c
+
+ install: TestMasterMicroMod
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+ rm -f $(PREFIX)/bin/TestMasterMicroMod
+Index: CanFestival-3-20080926/objdictgen/Makefile.in
+===================================================================
+--- CanFestival-3-20080926.orig/objdictgen/Makefile.in 2008-09-26 12:22:50.000000000 +0200
++++ CanFestival-3-20080926/objdictgen/Makefile.in 2008-09-26 12:24:52.000000000 +0200
+@@ -35,19 +35,19 @@
+ rm -rf gnosis_extract
+
+ install: gnosis
+- mkdir -p $(PREFIX)/objdictgen
+- cp -r *.py* config doc doc_index examples gnosis $(PREFIX)/objdictgen
+- chmod -R a+r $(PREFIX)/objdictgen
+- mkdir -p $(PREFIX)/bin
+- ln -sf $(PREFIX)/objdictgen/objdictedit.py $(PREFIX)/bin/objdictedit
+- chmod 755 $(PREFIX)/objdictgen/objdictedit.py
+- ln -sf $(PREFIX)/objdictgen/objdictgen.py $(PREFIX)/bin/objdictgen
+- chmod 755 $(PREFIX)/objdictgen/objdictgen.py
++ mkdir -p $(DESTDIR)$(PREFIX)/objdictgen
++ cp -r *.py* config doc doc_index examples gnosis $(DESTDIR)$(PREFIX)/objdictgen
++ chmod -R a+r $(DESTDIR)$(PREFIX)/objdictgen
++ mkdir -p $(DESTDIR)$(PREFIX)/bin
++ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py $(DESTDIR)$(PREFIX)/bin/objdictedit
++ chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py
++ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py $(DESTDIR)$(PREFIX)/bin/objdictgen
++ chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py
+
+ uninstall:
+- rm -rf $(PREFIX)/objdictgen
+- rm -f $(PREFIX)/bin/objdictedit
+- rm -f $(PREFIX)/bin/objdictgen
++ rm -rf $(DESTDIR)$(PREFIX)/objdictgen
++ rm -f $(DESTDIR)$(PREFIX)/bin/objdictedit
++ rm -f $(DESTDIR)$(PREFIX)/bin/objdictgen
+
+ clean:
+
diff --git a/patches/CanFestival-3-20081204-1/generic/fix-ldconfig.diff b/patches/CanFestival-3-20081204-1/generic/fix-ldconfig.diff
new file mode 100644
index 000000000..86e29e9fc
--- /dev/null
+++ b/patches/CanFestival-3-20081204-1/generic/fix-ldconfig.diff
@@ -0,0 +1,13 @@
+Index: CanFestival-3-20080926/Makefile.in
+===================================================================
+--- CanFestival-3-20080926.orig/Makefile.in 2008-09-26 11:39:51.000000000 +0200
++++ CanFestival-3-20080926/Makefile.in 2008-09-26 11:39:59.000000000 +0200
+@@ -46,7 +46,7 @@
+ $(MAKE) -C src $@
+ $(MAKE) -C examples $@
+ $(MAKE) -C objdictgen $@
+- ldconfig
++ -ldconfig
+
+ uninstall:
+ $(MAKE) -C drivers $@
diff --git a/patches/CanFestival-3-20081204-1/generic/install-networkedit_ico.diff b/patches/CanFestival-3-20081204-1/generic/install-networkedit_ico.diff
new file mode 100644
index 000000000..5b479a3fe
--- /dev/null
+++ b/patches/CanFestival-3-20081204-1/generic/install-networkedit_ico.diff
@@ -0,0 +1,13 @@
+Index: CanFestival-3-20080926/objdictgen/Makefile.in
+===================================================================
+--- CanFestival-3-20080926.orig/objdictgen/Makefile.in 2008-09-26 12:26:30.000000000 +0200
++++ CanFestival-3-20080926/objdictgen/Makefile.in 2008-09-26 12:27:58.000000000 +0200
+@@ -36,7 +36,7 @@
+
+ install: gnosis
+ mkdir -p $(DESTDIR)$(PREFIX)/objdictgen
+- cp -r *.py* config doc doc_index examples gnosis $(DESTDIR)$(PREFIX)/objdictgen
++ cp -r *.py* config doc doc_index examples gnosis networkedit.ico $(DESTDIR)$(PREFIX)/objdictgen
+ chmod -R a+r $(DESTDIR)$(PREFIX)/objdictgen
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py $(DESTDIR)$(PREFIX)/bin/objdictedit
diff --git a/patches/CanFestival-3-20081204-1/generic/series b/patches/CanFestival-3-20081204-1/generic/series
new file mode 100644
index 000000000..5f5db88d1
--- /dev/null
+++ b/patches/CanFestival-3-20081204-1/generic/series
@@ -0,0 +1,4 @@
+fix-destdir.diff
+fix-ldconfig.diff
+install-networkedit_ico.diff
+byteorder.diff