From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v3] CanFestival: version bump 3-20081204-1 -> 3+hg20180126.794
Date: Tue, 24 Apr 2018 09:38:42 +0200 [thread overview]
Message-ID: <20180424073842.24749-1-u.kleine-koenig@pengutronix.de> (raw)
This uses a new snapshot of CanFestival available from the repository
https://hg.beremiz.org/CanFestival-3/ which is the "main repo" according
to https://canfestival.org/code .
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Changes since v2:
- make it actually build
- some values can be overridden with configure, but there is no
autodetection, so these are dropped
- use $(call ptx/ifdef, ...) instead of make ifdef
...-for-ldconfig-crash-on-make-install.patch} | 2 +-
.../0002-fix-for-CAN-ID-byteorder.patch} | 162 +++----
.../0003-Makefile.in-fix-suffix-rules.patch | 46 ++
patches/CanFestival-3+hg20180126.794/series | 6 +
.../0001-add-DESTDIR-to-Makefile.in.patch | 161 -------
.../0003-install-networkedit.ico.patch | 25 --
.../0005-Makefile.in-fix-suffix-rules.patch | 406 ------------------
patches/CanFestival-3-20081204-1/series | 8 -
rules/canfestival.make | 25 +-
9 files changed, 122 insertions(+), 719 deletions(-)
rename patches/{CanFestival-3-20081204-1/0002-fix-for-ldconfig-crash-on-make-install.patch => CanFestival-3+hg20180126.794/0001-fix-for-ldconfig-crash-on-make-install.patch} (93%)
rename patches/{CanFestival-3-20081204-1/0004-fix-for-CAN-ID-byteorder.patch => CanFestival-3+hg20180126.794/0002-fix-for-CAN-ID-byteorder.patch} (59%)
create mode 100644 patches/CanFestival-3+hg20180126.794/0003-Makefile.in-fix-suffix-rules.patch
create mode 100644 patches/CanFestival-3+hg20180126.794/series
delete mode 100644 patches/CanFestival-3-20081204-1/0001-add-DESTDIR-to-Makefile.in.patch
delete mode 100644 patches/CanFestival-3-20081204-1/0003-install-networkedit.ico.patch
delete mode 100644 patches/CanFestival-3-20081204-1/0005-Makefile.in-fix-suffix-rules.patch
delete mode 100644 patches/CanFestival-3-20081204-1/series
diff --git a/patches/CanFestival-3-20081204-1/0002-fix-for-ldconfig-crash-on-make-install.patch b/patches/CanFestival-3+hg20180126.794/0001-fix-for-ldconfig-crash-on-make-install.patch
similarity index 93%
rename from patches/CanFestival-3-20081204-1/0002-fix-for-ldconfig-crash-on-make-install.patch
rename to patches/CanFestival-3+hg20180126.794/0001-fix-for-ldconfig-crash-on-make-install.patch
index f77e89a8835b..06fcc78d6647 100644
--- a/patches/CanFestival-3-20081204-1/0002-fix-for-ldconfig-crash-on-make-install.patch
+++ b/patches/CanFestival-3+hg20180126.794/0001-fix-for-ldconfig-crash-on-make-install.patch
@@ -10,7 +10,7 @@ Signed-off-by: Markus Messmer <mme@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
-index 957281e..bdfff24 100644
+index 957281e91352..bdfff24c8b3a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,7 @@ install: canfestival driver
diff --git a/patches/CanFestival-3-20081204-1/0004-fix-for-CAN-ID-byteorder.patch b/patches/CanFestival-3+hg20180126.794/0002-fix-for-CAN-ID-byteorder.patch
similarity index 59%
rename from patches/CanFestival-3-20081204-1/0004-fix-for-CAN-ID-byteorder.patch
rename to patches/CanFestival-3+hg20180126.794/0002-fix-for-CAN-ID-byteorder.patch
index a1129660e9fa..cb7df6bfc336 100644
--- a/patches/CanFestival-3-20081204-1/0004-fix-for-CAN-ID-byteorder.patch
+++ b/patches/CanFestival-3+hg20180126.794/0002-fix-for-CAN-ID-byteorder.patch
@@ -10,19 +10,18 @@ FIXME rsc: needs to be made architecture independend.
Signed-off-by: Markus Messmer <mme@pengutronix.de>
---
include/objdictdef.h | 4 ++--
- src/emcy.c | 4 ++--
src/lifegrd.c | 4 ++--
src/lss.c | 4 ++--
src/nmtMaster.c | 2 +-
src/nmtSlave.c | 2 +-
src/pdo.c | 20 ++++++++++----------
- src/sdo.c | 10 +++++-----
+ src/sdo.c | 4 ++--
src/states.c | 2 +-
src/sync.c | 2 +-
- 10 files changed, 27 insertions(+), 27 deletions(-)
+ 9 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/include/objdictdef.h b/include/objdictdef.h
-index 8361ee6..40ee460 100644
+index 60948b85a752..1ee36e88a155 100644
--- a/include/objdictdef.h
+++ b/include/objdictdef.h
@@ -118,7 +118,7 @@ typedef const indextable * (*scanIndexOD_t)(UNS16 wIndex, UNS32 * errorCode, ODC
@@ -35,33 +34,11 @@ index 8361ee6..40ee460 100644
+#define GET_FUNCTION_CODE(m) (m.cob_id >> 7)
#endif /* __objdictdef_h__ */
-diff --git a/src/emcy.c b/src/emcy.c
-index 272442a..0a3ca92 100644
---- a/src/emcy.c
-+++ b/src/emcy.c
-@@ -101,7 +101,7 @@ UNS8 sendEMCY(CO_Data* d, UNS16 errCode, UNS8 errRegister)
-
- 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 @@ void proceedEMCY(CO_Data* d, Message* m)
- }
-
- /* 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);
diff --git a/src/lifegrd.c b/src/lifegrd.c
-index 54b14f3..3a6530b 100644
+index 566a4922a491..c98c4580b532 100644
--- a/src/lifegrd.c
+++ b/src/lifegrd.c
-@@ -103,7 +103,7 @@ void proceedNODE_GUARD(CO_Data* d, Message* m )
+@@ -99,7 +99,7 @@ void proceedNODE_GUARD(CO_Data* d, Message* m )
{
Message msg;
UNS16 tmp = *d->bDeviceNodeId + 0x700;
@@ -70,7 +47,7 @@ index 54b14f3..3a6530b 100644
msg.len = (UNS8)0x01;
msg.rtr = 0;
msg.data[0] = d->nodeState;
-@@ -180,7 +180,7 @@ void ProducerHearbeatAlarm(CO_Data* d, UNS32 id)
+@@ -181,7 +181,7 @@ void ProducerHeartbeatAlarm(CO_Data* d, UNS32 id)
** the node-id of this device.
*/
UNS16 tmp = *d->bDeviceNodeId + 0x700;
@@ -80,7 +57,7 @@ index 54b14f3..3a6530b 100644
msg.rtr = 0;
msg.data[0] = d->nodeState; /* No toggle for heartbeat !*/
diff --git a/src/lss.c b/src/lss.c
-index 2febb62..d244d36 100644
+index 2febb6229320..d244d361d351 100644
--- a/src/lss.c
+++ b/src/lss.c
@@ -330,7 +330,7 @@ UNS8 sendSlaveLSSMessage(CO_Data* d, UNS8 command,void *dat1,void *dat2)
@@ -102,7 +79,7 @@ index 2febb62..d244d36 100644
/* Tha data sent with the msg depends on the command */
switch(command){
diff --git a/src/nmtMaster.c b/src/nmtMaster.c
-index 22b11c8..9e3a80f 100644
+index ba4cb05c50d2..a2efd36d6d68 100644
--- a/src/nmtMaster.c
+++ b/src/nmtMaster.c
@@ -74,7 +74,7 @@ UNS8 masterSendNMTnodeguard(CO_Data* d, UNS8 nodeId)
@@ -112,10 +89,10 @@ index 22b11c8..9e3a80f 100644
- m.cob_id = UNS16_LE(tmp);
+ m.cob_id = tmp;
m.rtr = REQUEST;
- m.len = 1;
+ m.len = 0;
diff --git a/src/nmtSlave.c b/src/nmtSlave.c
-index 0ff2eba..ee6efee 100644
+index 0ff2ebac5a7e..ee6efee62b91 100644
--- a/src/nmtSlave.c
+++ b/src/nmtSlave.c
@@ -128,7 +128,7 @@ UNS8 slaveSendBootUp(CO_Data* d)
@@ -128,19 +105,19 @@ index 0ff2eba..ee6efee 100644
m.rtr = NOT_A_REQUEST;
m.len = 1;
diff --git a/src/pdo.c b/src/pdo.c
-index 457c495..c435d7a 100644
+index f5174ce64a56..f4cd2cb3ff7c 100644
--- a/src/pdo.c
+++ b/src/pdo.c
@@ -55,7 +55,7 @@ UNS8 buildPDO (CO_Data * d, UNS8 numPdo, Message * pdo)
- UNS8 offset = 0x00;
+ UNS32 offset = 0x00000000;
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->cob_id = (UNS16) UNS16_LE(*(UNS32*)TPDO_com->pSubindex[1].pObject & 0x7FF);
++ pdo->cob_id = (UNS16) *(UNS32*)TPDO_com->pSubindex[1].pObject & 0x7FF;
pdo->rtr = NOT_A_REQUEST;
MSG_WAR (0x3009, " PDO CobId is : ",
-@@ -141,7 +141,7 @@ sendPDOrequest (CO_Data * d, UNS16 RPDOIndex)
+@@ -146,7 +146,7 @@ sendPDOrequest (CO_Data * d, UNS16 RPDOIndex)
MSG_WAR (0x3930, "sendPDOrequest cobId is : ", *pwCobId);
{
Message pdo;
@@ -149,7 +126,7 @@ index 457c495..c435d7a 100644
pdo.rtr = REQUEST;
pdo.len = 0;
return canSend (d->canHandle, &pdo);
-@@ -184,7 +184,7 @@ proceedPDO (CO_Data * d, Message * m)
+@@ -189,7 +189,7 @@ proceedPDO (CO_Data * d, Message * m)
status = state2;
@@ -158,16 +135,16 @@ index 457c495..c435d7a 100644
offset = 0x00;
numPdo = 0;
numMap = 0;
-@@ -211,7 +211,7 @@ proceedPDO (CO_Data * d, Message * m)
- /* check the CobId coherance */
- /*pwCobId is the cobId read in the dictionary at the state 3
- */
+@@ -206,7 +206,7 @@ proceedPDO (CO_Data * d, Message * m)
+
+ case state2:
+ pwCobId = d->objdict[offsetObjdict].pSubindex[1].pObject;
- if (*pwCobId == UNS16_LE(m->cob_id))
+ if (*pwCobId == m->cob_id)
{
/* The cobId is recognized */
status = state4;
-@@ -289,7 +289,7 @@ proceedPDO (CO_Data * d, Message * m)
+@@ -283,7 +283,7 @@ proceedPDO (CO_Data * d, Message * m)
MSG_WAR (0x3942,
"Variable updated by PDO cobid : ",
@@ -176,7 +153,7 @@ index 457c495..c435d7a 100644
MSG_WAR (0x3943, " Mapped at index : ",
(*pMappingParameter) >> 16);
MSG_WAR (0x3944, " subindex : ",
-@@ -306,7 +306,7 @@ proceedPDO (CO_Data * d, Message * m)
+@@ -308,7 +308,7 @@ proceedPDO (CO_Data * d, Message * m)
} /* end if Donnees */
else if ((*m).rtr == REQUEST)
{
@@ -185,7 +162,7 @@ index 457c495..c435d7a 100644
status = state1;
offsetObjdict = d->firstIndex->PDO_TRS;
lastIndex = d->lastIndex->PDO_TRS;
-@@ -324,7 +324,7 @@ proceedPDO (CO_Data * d, Message * m)
+@@ -326,7 +326,7 @@ proceedPDO (CO_Data * d, Message * m)
pwCobId =
(d->objdict +
offsetObjdict)->pSubindex[1].pObject;
@@ -194,7 +171,7 @@ index 457c495..c435d7a 100644
{
status = state4;
break;
-@@ -364,7 +364,7 @@ proceedPDO (CO_Data * d, Message * m)
+@@ -366,7 +366,7 @@ proceedPDO (CO_Data * d, Message * m)
/* DS301 do not tell what to do in such a case... */
MSG_ERR (0x1947,
"Not ready RTR_SYNC TPDO send current data : ",
@@ -203,7 +180,7 @@ index 457c495..c435d7a 100644
status = state5;
}
break;
-@@ -389,7 +389,7 @@ proceedPDO (CO_Data * d, Message * m)
+@@ -391,7 +391,7 @@ proceedPDO (CO_Data * d, Message * m)
/* The requested PDO is not to send on request. So, does
nothing. */
MSG_WAR (0x2947, "PDO is not to send on request : ",
@@ -212,66 +189,39 @@ index 457c495..c435d7a 100644
return 0xFF;
}
-@@ -690,7 +690,7 @@ _sendPDOevent (CO_Data * d, UNS8 isSyncEvent)
- 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);
+@@ -484,7 +484,7 @@ static void sendPdo(CO_Data * d, UNS32 pdoNum, Message * 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);
+ canSend (d->canHandle, pdo);
diff --git a/src/sdo.c b/src/sdo.c
-index 4e26652..1262cf9 100644
+index f5abb11ce5db..394e1609aa61 100644
--- a/src/sdo.c
+++ b/src/sdo.c
-@@ -547,7 +547,7 @@ UNS8 sendSDO (CO_Data* d, UNS8 whoami, s_SDO sdo)
- 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 @@ UNS8 proceedSDO (CO_Data* d, Message *m)
- 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 @@ UNS8 proceedSDO (CO_Data* d, Message *m)
- }
- /* 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 @@ UNS8 proceedSDO (CO_Data* d, Message *m)
-
- /* 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 @@ UNS8 proceedSDO (CO_Data* d, Message *m)
- 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 */
+@@ -780,7 +780,7 @@ UNS8 proceedSDO (CO_Data* d, Message *m)
+ }
+ /* Looking for the cobid received. */
+ 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);
+ /* Defining Server number = index minus 0x1200 where the cobid received is defined. */
+@@ -802,7 +802,7 @@ UNS8 proceedSDO (CO_Data* d, Message *m)
+ }
+ /* 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 ) {
+ whoami = SDO_CLIENT;
+ MSG_WAR(0x3A64, "proceedSDO. I am client index : ", 0x1280 + j);
+ /* Defining Client number = index minus 0x1280 where the cobid received is defined. */
diff --git a/src/states.c b/src/states.c
-index c7d5df7..208dcc9 100644
+index a8fb3d3fd1a8..866f055d655f 100644
--- a/src/states.c
+++ b/src/states.c
@@ -62,7 +62,7 @@ e_nodeState getState(CO_Data* d)
@@ -284,15 +234,15 @@ index c7d5df7..208dcc9 100644
{
case SYNC: /* can be a SYNC or a EMCY message */
diff --git a/src/sync.c b/src/sync.c
-index bae1925..7ff65f2 100644
+index 52a15ac71540..a2e163d81e9f 100644
--- a/src/sync.c
+++ b/src/sync.c
@@ -131,7 +131,7 @@ UNS8 sendSYNCMessage(CO_Data* d)
MSG_WAR(0x3001, "sendSYNC ", 0);
-- m.cob_id = UNS16_LE(*d->COB_ID_Sync);
-+ m.cob_id = *d->COB_ID_Sync;
+- m.cob_id = (UNS16)UNS16_LE(*d->COB_ID_Sync);
++ m.cob_id = (UNS16)*d->COB_ID_Sync;
m.rtr = NOT_A_REQUEST;
m.len = 0;
diff --git a/patches/CanFestival-3+hg20180126.794/0003-Makefile.in-fix-suffix-rules.patch b/patches/CanFestival-3+hg20180126.794/0003-Makefile.in-fix-suffix-rules.patch
new file mode 100644
index 000000000000..fda8c2bfc0b8
--- /dev/null
+++ b/patches/CanFestival-3+hg20180126.794/0003-Makefile.in-fix-suffix-rules.patch
@@ -0,0 +1,46 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sun, 1 Jun 2014 22:33:36 +0200
+Subject: [PATCH] Makefile.in: fix suffix rules
+
+With modern toolchains, "%o: %c" isn't a correct suffix rule any more
+and make falls back to the built-in default rules, which gives us this
+error:
+
+ make[2]: Leaving directory 'CanFestival-3-20081204-1/objdictgen'
+ timers_unix.c:7:22: fatal error: applicfg.h: No such file or directory
+ #include "applicfg.h"
+ ^
+ compilation terminated.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ drivers/hcs12/Makefile.in | 2 +-
+ examples/gene_SYNC_HCS12/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/hcs12/Makefile.in b/drivers/hcs12/Makefile.in
+index 501bb681ae49..6ddaea3ad6db 100644
+--- a/drivers/hcs12/Makefile.in
++++ b/drivers/hcs12/Makefile.in
+@@ -55,7 +55,7 @@ libcandriver.a: $(OBJS)
+ @echo "*********************************************"
+ $(CC) $(OPT_CFLAGS) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -c -o $@ $<
+
+-%o: %s
++%.o: %.s
+ @echo " "
+ @echo "*********************************************"
+ @echo "**Compiling $< -> $@"
+diff --git a/examples/gene_SYNC_HCS12/Makefile.in b/examples/gene_SYNC_HCS12/Makefile.in
+index 0f34c5a5e2a8..ba7cb63dd4b4 100644
+--- a/examples/gene_SYNC_HCS12/Makefile.in
++++ b/examples/gene_SYNC_HCS12/Makefile.in
+@@ -68,7 +68,7 @@ all: $(PGR).elf $(PGR).s19 $(PGR).b $(PGR).s MSG
+ @echo "*********************************************"
+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -c -o $@ $<
+
+-%o: %s
++%.o: %.s
+ @echo " "
+ @echo "*********************************************"
+ @echo "**Compiling $< -> $@"
diff --git a/patches/CanFestival-3+hg20180126.794/series b/patches/CanFestival-3+hg20180126.794/series
new file mode 100644
index 000000000000..5bad73b7227b
--- /dev/null
+++ b/patches/CanFestival-3+hg20180126.794/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fix-for-ldconfig-crash-on-make-install.patch
+0002-fix-for-CAN-ID-byteorder.patch
+0003-Makefile.in-fix-suffix-rules.patch
+# dd854f5028c1d8578c6dffd44f0d1f06 - git-ptx-patches magic
diff --git a/patches/CanFestival-3-20081204-1/0001-add-DESTDIR-to-Makefile.in.patch b/patches/CanFestival-3-20081204-1/0001-add-DESTDIR-to-Makefile.in.patch
deleted file mode 100644
index c73bf44e40c3..000000000000
--- a/patches/CanFestival-3-20081204-1/0001-add-DESTDIR-to-Makefile.in.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From: Markus Messmer <mme@pengutronix.de>
-Date: Sat, 29 Oct 2011 18:32:03 +0200
-Subject: [PATCH] add $(DESTDIR) to Makefile.in
-
-Makefile is not $(DESTDIR) aware, this patch adds some $(DESTDIR)s.
-
-Signed-off-by: Markus Messmer <mme@pengutronix.de>
----
- drivers/can_socket/Makefile.in | 4 ++--
- drivers/timers_unix/Makefile.in | 4 ++--
- drivers/unix/Makefile.in | 8 ++++----
- examples/TestMasterMicroMod/Makefile.in | 4 ++--
- examples/TestMasterSlave/Makefile.in | 4 ++--
- objdictgen/Makefile.in | 22 +++++++++++-----------
- src/Makefile.in | 12 ++++++------
- 7 files changed, 29 insertions(+), 29 deletions(-)
-
-diff --git a/drivers/can_socket/Makefile.in b/drivers/can_socket/Makefile.in
-index 2c94b8c..34ecf1a 100644
---- a/drivers/can_socket/Makefile.in
-+++ b/drivers/can_socket/Makefile.in
-@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
- $(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)
-diff --git a/drivers/timers_unix/Makefile.in b/drivers/timers_unix/Makefile.in
-index d2bc080..a5c141d 100644
---- a/drivers/timers_unix/Makefile.in
-+++ b/drivers/timers_unix/Makefile.in
-@@ -48,8 +48,8 @@ driver: $(OBJS)
- $(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)
-diff --git a/drivers/unix/Makefile.in b/drivers/unix/Makefile.in
-index 9c92293..f8cc854 100644
---- a/drivers/unix/Makefile.in
-+++ b/drivers/unix/Makefile.in
-@@ -97,10 +97,10 @@ libcanfestival_$(TARGET).a: $(OBJS)
- $(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
-diff --git a/examples/TestMasterMicroMod/Makefile.in b/examples/TestMasterMicroMod/Makefile.in
-index bb15b55..97c3357 100644
---- a/examples/TestMasterMicroMod/Makefile.in
-+++ b/examples/TestMasterMicroMod/Makefile.in
-@@ -74,8 +74,8 @@ mrproper: clean
- 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
-diff --git a/examples/TestMasterSlave/Makefile.in b/examples/TestMasterSlave/Makefile.in
-index 862ee35..b8ffd2f 100644
---- a/examples/TestMasterSlave/Makefile.in
-+++ b/examples/TestMasterSlave/Makefile.in
-@@ -87,8 +87,8 @@ mrproper: clean
- 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
-diff --git a/objdictgen/Makefile.in b/objdictgen/Makefile.in
-index bd9db22..16a0f67 100644
---- a/objdictgen/Makefile.in
-+++ b/objdictgen/Makefile.in
-@@ -35,19 +35,19 @@ gnosis/version.py:
- 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/src/Makefile.in b/src/Makefile.in
-index 3613b92..2212908 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -87,8 +87,8 @@ clean:
-
- 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 @@ $(TARGET)_%o: %c
- $(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
diff --git a/patches/CanFestival-3-20081204-1/0003-install-networkedit.ico.patch b/patches/CanFestival-3-20081204-1/0003-install-networkedit.ico.patch
deleted file mode 100644
index 8a5bb5873932..000000000000
--- a/patches/CanFestival-3-20081204-1/0003-install-networkedit.ico.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Markus Messmer <mme@pengutronix.de>
-Date: Sat, 29 Oct 2011 18:32:03 +0200
-Subject: [PATCH] install networkedit.ico
-
-networkedit.ico does not get installed by default, objdictedit complains about
-it. This patch adds it to the installed files.
-
-Signed-off-by: Markus Messmer <mme@pengutronix.de>
----
- objdictgen/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/objdictgen/Makefile.in b/objdictgen/Makefile.in
-index 16a0f67..edeac27 100644
---- a/objdictgen/Makefile.in
-+++ b/objdictgen/Makefile.in
-@@ -36,7 +36,7 @@ gnosis/version.py:
-
- 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/0005-Makefile.in-fix-suffix-rules.patch b/patches/CanFestival-3-20081204-1/0005-Makefile.in-fix-suffix-rules.patch
deleted file mode 100644
index 0e28179831b7..000000000000
--- a/patches/CanFestival-3-20081204-1/0005-Makefile.in-fix-suffix-rules.patch
+++ /dev/null
@@ -1,406 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Sun, 1 Jun 2014 22:33:36 +0200
-Subject: [PATCH] Makefile.in: fix suffix rules
-
-With modern toolchains, "%o: %c" isn't a correct suffix rule any more
-and make falls back to the built-in default rules, which gives us this
-error:
-
- make[2]: Leaving directory 'CanFestival-3-20081204-1/objdictgen'
- timers_unix.c:7:22: fatal error: applicfg.h: No such file or directory
- #include "applicfg.h"
- ^
- compilation terminated.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- drivers/can_anagate_linux/Makefile.in | 2 +-
- drivers/can_anagate_win32/Makefile.in | 4 ++--
- drivers/can_can4linux/Makefile.in | 2 +-
- drivers/can_kvaser/Makefile.in | 2 +-
- drivers/can_lincan/Makefile.in | 2 +-
- drivers/can_peak_linux/Makefile.in | 2 +-
- drivers/can_peak_win32/Makefile.in | 2 +-
- drivers/can_serial/Makefile.in | 2 +-
- drivers/can_socket/Makefile.in | 2 +-
- drivers/can_tcp_win32/Makefile.in | 4 ++--
- drivers/can_virtual/Makefile.in | 2 +-
- drivers/can_vscom/Makefile.in | 2 +-
- drivers/hcs12/Makefile.in | 4 ++--
- drivers/timers_rtai/Makefile.in | 2 +-
- drivers/timers_unix/Makefile.in | 2 +-
- drivers/timers_win32/Makefile.in | 2 +-
- drivers/timers_xeno/Makefile.in | 2 +-
- drivers/unix/Makefile.in | 2 +-
- drivers/win32/Makefile.in | 2 +-
- examples/DS401_Master/Makefile.in | 2 +-
- examples/DS401_Slave_Gui/Makefile.in | 2 +-
- examples/SillySlave/Makefile.in | 2 +-
- examples/TestMasterMicroMod/Makefile.in | 2 +-
- examples/TestMasterSlave/Makefile.in | 2 +-
- examples/TestMasterSlaveLSS/Makefile.in | 2 +-
- examples/gene_SYNC_HCS12/Makefile.in | 4 ++--
- 26 files changed, 30 insertions(+), 30 deletions(-)
-
-diff --git a/drivers/can_anagate_linux/Makefile.in b/drivers/can_anagate_linux/Makefile.in
-index 2ea521b..5c96ed1 100644
---- a/drivers/can_anagate_linux/Makefile.in
-+++ b/drivers/can_anagate_linux/Makefile.in
-@@ -49,7 +49,7 @@ all: driver
-
- driver: $(DRIVER)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- libcanfestival_$(CAN_DRIVER).so: $(OBJS)
-diff --git a/drivers/can_anagate_win32/Makefile.in b/drivers/can_anagate_win32/Makefile.in
-index 79274ce..6926cec 100644
---- a/drivers/can_anagate_win32/Makefile.in
-+++ b/drivers/can_anagate_win32/Makefile.in
-@@ -53,10 +53,10 @@ all: driver
- driver: $(DRIVER)
-
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
--%o: %cpp
-+%.o: %.cpp
- $(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- $(DRIVER): $(OBJS)
-diff --git a/drivers/can_can4linux/Makefile.in b/drivers/can_can4linux/Makefile.in
-index 3caddb4..32c5cb6 100644
---- a/drivers/can_can4linux/Makefile.in
-+++ b/drivers/can_can4linux/Makefile.in
-@@ -48,7 +48,7 @@ all: driver
-
- driver: $(DRIVER)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- libcanfestival_$(CAN_DRIVER).so: $(OBJS)
-diff --git a/drivers/can_kvaser/Makefile.in b/drivers/can_kvaser/Makefile.in
-index e119372..b8e177c 100644
---- a/drivers/can_kvaser/Makefile.in
-+++ b/drivers/can_kvaser/Makefile.in
-@@ -58,7 +58,7 @@ all: driver
-
- driver: $(DRIVER)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- $(DRIVER): $(OBJS)
-diff --git a/drivers/can_lincan/Makefile.in b/drivers/can_lincan/Makefile.in
-index 3caddb4..32c5cb6 100644
---- a/drivers/can_lincan/Makefile.in
-+++ b/drivers/can_lincan/Makefile.in
-@@ -48,7 +48,7 @@ all: driver
-
- driver: $(DRIVER)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- libcanfestival_$(CAN_DRIVER).so: $(OBJS)
-diff --git a/drivers/can_peak_linux/Makefile.in b/drivers/can_peak_linux/Makefile.in
-index 2ea521b..5c96ed1 100644
---- a/drivers/can_peak_linux/Makefile.in
-+++ b/drivers/can_peak_linux/Makefile.in
-@@ -49,7 +49,7 @@ all: driver
-
- driver: $(DRIVER)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- libcanfestival_$(CAN_DRIVER).so: $(OBJS)
-diff --git a/drivers/can_peak_win32/Makefile.in b/drivers/can_peak_win32/Makefile.in
-index 8f75395..f29df6c 100644
---- a/drivers/can_peak_win32/Makefile.in
-+++ b/drivers/can_peak_win32/Makefile.in
-@@ -51,7 +51,7 @@ all: driver
-
- driver: $(DRIVER)
-
--%o: %c cancfg.h
-+%.o: %.c cancfg.h
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- cyg$(CAN_DRIVER).dll: $(OBJS)
-diff --git a/drivers/can_serial/Makefile.in b/drivers/can_serial/Makefile.in
-index 69251a5..5f79bbe 100644
---- a/drivers/can_serial/Makefile.in
-+++ b/drivers/can_serial/Makefile.in
-@@ -56,7 +56,7 @@ $(HUB): $(HUB).c
-
- driver: $(DRIVER) $(HUB)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- libcanfestival_$(CAN_DRIVER).so: $(OBJS)
-diff --git a/drivers/can_socket/Makefile.in b/drivers/can_socket/Makefile.in
-index 34ecf1a..8197866 100644
---- a/drivers/can_socket/Makefile.in
-+++ b/drivers/can_socket/Makefile.in
-@@ -49,7 +49,7 @@ all: driver
-
- driver: $(DRIVER)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- libcanfestival_$(CAN_DRIVER).so: $(OBJS)
-diff --git a/drivers/can_tcp_win32/Makefile.in b/drivers/can_tcp_win32/Makefile.in
-index 2a13db2..321bf0c 100755
---- a/drivers/can_tcp_win32/Makefile.in
-+++ b/drivers/can_tcp_win32/Makefile.in
-@@ -59,10 +59,10 @@ $(SERVER).exe: Socket.o $(SERVER).cpp
- Socket.o: Socket.cpp Socket.h
- $(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -c $< -o $@
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
--%o: %cpp
-+%.o: %.cpp
- $(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- $(DRIVER): $(OBJS)
-diff --git a/drivers/can_virtual/Makefile.in b/drivers/can_virtual/Makefile.in
-index 8e479ca..e543a95 100644
---- a/drivers/can_virtual/Makefile.in
-+++ b/drivers/can_virtual/Makefile.in
-@@ -49,7 +49,7 @@ all: driver
-
- driver: $(DRIVER)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- libcanfestival_$(CAN_DRIVER).so: $(OBJS)
-diff --git a/drivers/can_vscom/Makefile.in b/drivers/can_vscom/Makefile.in
-index 58b0c88..26493db 100755
---- a/drivers/can_vscom/Makefile.in
-+++ b/drivers/can_vscom/Makefile.in
-@@ -76,7 +76,7 @@ vs_can_api.h:
-
- driver: vs_can_api.h $(DRIVER)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- libcanfestival_$(CAN_DRIVER).$(DLL_TYPE): $(OBJS)
-diff --git a/drivers/hcs12/Makefile.in b/drivers/hcs12/Makefile.in
-index 2fb0ca4..6ddaea3 100644
---- a/drivers/hcs12/Makefile.in
-+++ b/drivers/hcs12/Makefile.in
-@@ -48,14 +48,14 @@ libcandriver.a: $(OBJS)
- ar rc $@ $(OBJS)
- ranlib $@
-
--%o: %c
-+%.o: %.c
- @echo " "
- @echo "*********************************************"
- @echo "**Compiling $< -> $@"
- @echo "*********************************************"
- $(CC) $(OPT_CFLAGS) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -c -o $@ $<
-
--%o: %s
-+%.o: %.s
- @echo " "
- @echo "*********************************************"
- @echo "**Compiling $< -> $@"
-diff --git a/drivers/timers_rtai/Makefile.in b/drivers/timers_rtai/Makefile.in
-index 0990369..4efd4c7 100755
---- a/drivers/timers_rtai/Makefile.in
-+++ b/drivers/timers_rtai/Makefile.in
-@@ -44,7 +44,7 @@ all: driver
-
- driver: $(OBJS)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- install:
-diff --git a/drivers/timers_unix/Makefile.in b/drivers/timers_unix/Makefile.in
-index a5c141d..c62763a 100644
---- a/drivers/timers_unix/Makefile.in
-+++ b/drivers/timers_unix/Makefile.in
-@@ -44,7 +44,7 @@ all: driver
-
- driver: $(OBJS)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- install:
-diff --git a/drivers/timers_win32/Makefile.in b/drivers/timers_win32/Makefile.in
-index 61c88f8..e19c35a 100755
---- a/drivers/timers_win32/Makefile.in
-+++ b/drivers/timers_win32/Makefile.in
-@@ -46,7 +46,7 @@ all: driver
-
- driver: $(OBJS)
-
--%o: %cpp
-+%.o: %.cpp
- $(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- install:
-diff --git a/drivers/timers_xeno/Makefile.in b/drivers/timers_xeno/Makefile.in
-index 0990369..4efd4c7 100644
---- a/drivers/timers_xeno/Makefile.in
-+++ b/drivers/timers_xeno/Makefile.in
-@@ -44,7 +44,7 @@ all: driver
-
- driver: $(OBJS)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- install:
-diff --git a/drivers/unix/Makefile.in b/drivers/unix/Makefile.in
-index f8cc854..ef09017 100644
---- a/drivers/unix/Makefile.in
-+++ b/drivers/unix/Makefile.in
-@@ -82,7 +82,7 @@ CFLAGS = SUB_OPT_CFLAGS
-
- driver: $(OBJS)
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- #../$(TIMERS_DRIVER)/$(TIMERS_DRIVER).o:
-diff --git a/drivers/win32/Makefile.in b/drivers/win32/Makefile.in
-index 7c787d3..63f66ee 100755
---- a/drivers/win32/Makefile.in
-+++ b/drivers/win32/Makefile.in
-@@ -54,7 +54,7 @@ all: driver
- driver: $(OBJS)
-
-
--%o: %cpp
-+%.o: %.cpp
- $(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- #../$(TIMERS_DRIVER)/$(TIMERS_DRIVER).o:
-diff --git a/examples/DS401_Master/Makefile.in b/examples/DS401_Master/Makefile.in
-index 8d4689a..441750b 100644
---- a/examples/DS401_Master/Makefile.in
-+++ b/examples/DS401_Master/Makefile.in
-@@ -55,7 +55,7 @@ TestMaster.c: TestMaster.od
- $(MAKE) -C ../../objdictgen gnosis
- python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- clean:
-diff --git a/examples/DS401_Slave_Gui/Makefile.in b/examples/DS401_Slave_Gui/Makefile.in
-index 65df028..f600eb7 100644
---- a/examples/DS401_Slave_Gui/Makefile.in
-+++ b/examples/DS401_Slave_Gui/Makefile.in
-@@ -54,7 +54,7 @@ all: DS401_Slave_Gui
-
- DS401_Slave_Gui: ObjDict.c $(OBJS) $(CPP_OBJS)
- $(LD) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) $(OBJS) $(CPP_OBJS) $(EXE_CFLAGS) `wx-config --libs` -o $@
--%o: %c
-+%.o: %.c
- $(CC) -c $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) $< -o $@
-
- ObjDict.c: ObjDict.od
-diff --git a/examples/SillySlave/Makefile.in b/examples/SillySlave/Makefile.in
-index 897bd53..4ec1d59 100644
---- a/examples/SillySlave/Makefile.in
-+++ b/examples/SillySlave/Makefile.in
-@@ -55,7 +55,7 @@ SillySlave.c: SillySlave.od
- $(MAKE) -C ../../objdictgen gnosis
- python ../../objdictgen/objdictgen.py SillySlave.od SillySlave.c
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- clean:
-diff --git a/examples/TestMasterMicroMod/Makefile.in b/examples/TestMasterMicroMod/Makefile.in
-index 97c3357..7d808d3 100644
---- a/examples/TestMasterMicroMod/Makefile.in
-+++ b/examples/TestMasterMicroMod/Makefile.in
-@@ -63,7 +63,7 @@ TestMaster.c: TestMaster.od
- $(MAKE) -C ../../objdictgen gnosis
- python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- clean:
-diff --git a/examples/TestMasterSlave/Makefile.in b/examples/TestMasterSlave/Makefile.in
-index b8ffd2f..41b9b5d 100644
---- a/examples/TestMasterSlave/Makefile.in
-+++ b/examples/TestMasterSlave/Makefile.in
-@@ -75,7 +75,7 @@ TestMaster.c: TestMaster.od
- $(MAKE) -C ../../objdictgen gnosis
- python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- clean:
-diff --git a/examples/TestMasterSlaveLSS/Makefile.in b/examples/TestMasterSlaveLSS/Makefile.in
-index 3f01c41..ccdf7f1 100644
---- a/examples/TestMasterSlaveLSS/Makefile.in
-+++ b/examples/TestMasterSlaveLSS/Makefile.in
-@@ -74,7 +74,7 @@ TestMaster.c: TestMaster.od
- $(MAKE) -C ../../objdictgen gnosis
- python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
-
--%o: %c
-+%.o: %.c
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- clean:
-diff --git a/examples/gene_SYNC_HCS12/Makefile.in b/examples/gene_SYNC_HCS12/Makefile.in
-index fac95b1..ba7cb63 100644
---- a/examples/gene_SYNC_HCS12/Makefile.in
-+++ b/examples/gene_SYNC_HCS12/Makefile.in
-@@ -61,14 +61,14 @@ LDFLAGS= -Wl,-m,m68hc12elfb -L$(MEMORY_X)
-
- all: $(PGR).elf $(PGR).s19 $(PGR).b $(PGR).s MSG
-
--%o: %c
-+%.o: %.c
- @echo " "
- @echo "*********************************************"
- @echo "**Compiling $< -> $@"
- @echo "*********************************************"
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -c -o $@ $<
-
--%o: %s
-+%.o: %.s
- @echo " "
- @echo "*********************************************"
- @echo "**Compiling $< -> $@"
diff --git a/patches/CanFestival-3-20081204-1/series b/patches/CanFestival-3-20081204-1/series
deleted file mode 100644
index 11a951ad8c93..000000000000
--- a/patches/CanFestival-3-20081204-1/series
+++ /dev/null
@@ -1,8 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-add-DESTDIR-to-Makefile.in.patch
-0002-fix-for-ldconfig-crash-on-make-install.patch
-0003-install-networkedit.ico.patch
-0004-fix-for-CAN-ID-byteorder.patch
-0005-Makefile.in-fix-suffix-rules.patch
-# f915418a3de979b98cd9796fc2665095 - git-ptx-patches magic
diff --git a/rules/canfestival.make b/rules/canfestival.make
index d8aed433b774..80fdbec6a96c 100644
--- a/rules/canfestival.make
+++ b/rules/canfestival.make
@@ -19,11 +19,12 @@ endif
#
# Paths and names
#
-CANFESTIVAL_VERSION := 3-20081204-1
-CANFESTIVAL_MD5 := 792e225678402dcd026b7b25796d23ad
-CANFESTIVAL := CanFestival-$(CANFESTIVAL_VERSION)
-CANFESTIVAL_SUFFIX := tar.bz2
-CANFESTIVAL_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(CANFESTIVAL).$(CANFESTIVAL_SUFFIX)
+# Taken from https://hg.beremiz.org/CanFestival-3/rev/8bfe0ac00cdb
+CANFESTIVAL_VERSION := 3+hg20180126.794
+CANFESTIVAL_MD5 := c97bca1c4a81a17b1a75a1f8d068b2b3
+CANFESTIVAL := canfestival-$(CANFESTIVAL_VERSION)
+CANFESTIVAL_SUFFIX := tar.gz
+CANFESTIVAL_URL := https://hg.beremiz.org/CanFestival-3/archive/8bfe0ac00cdb.$(CANFESTIVAL_SUFFIX)
CANFESTIVAL_SOURCE := $(SRCDIR)/$(CANFESTIVAL).$(CANFESTIVAL_SUFFIX)
CANFESTIVAL_DIR := $(BUILDDIR)/$(CANFESTIVAL)
@@ -34,18 +35,18 @@ CANFESTIVAL_DIR := $(BUILDDIR)/$(CANFESTIVAL)
CANFESTIVAL_PATH := PATH=$(CROSS_PATH)
CANFESTIVAL_ENV := $(CROSS_ENV_CC)
# Overwrite OPT_CFLAGS instead of CFLAGS so we don't loose other flags
-# such as -fPIC for libs. Not this breaks when using "--disable-Ox"
+# such as -fPIC for libs. Note this breaks when using "--disable-Ox"
CANFESTIVAL_MAKEVARS := OPT_CFLAGS="-isystem $(KERNEL_HEADERS_INCLUDE_DIR) -O2"
#
# autoconf
#
-CANFESTIVAL_AUTOCONF := \
+CANFESTIVAL_CONF_TOOL := autoconf
+CANFESTIVAL_CONF_OPT := \
--prefix=/usr \
- --can=socket
-
-ifdef PTXCONF_ENDIAN_BIG
-CANFESTIVAL_AUTOCONF += --CANOPEN_BIG_ENDIAN=1
-endif
+ --can=socket \
+ --timers=unix \
+ --wx=0 \
+ $(call ptx/ifdef,PTXCONF_ENDIAN_BIG,--CANOPEN_BIG_ENDIAN=1) \
# ----------------------------------------------------------------------------
# Install
--
2.17.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2018-04-24 7:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180424073842.24749-1-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox