frodovdr/octonet
1
0
Fork 0
mirror of https://github.com/DigitalDevices/octonet.git synced 2023-10-10 11:36:52 +00:00
Code Issues Releases Wiki Activity

use seperate patch directory for our own buildroot patches

Browse Source 
bump octoserve version
This commit is contained in:
Ralph Metzler
2016-11-17 16:38:41 +01:00
parent a0e2ee78dc
commit 88574173d9
7 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
buildroot.octonet/patches/busybox/busybox-0001-Fix-zcip-arp-compare.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -rup busybox-1.23.1.orig/networking/zcip.c busybox-1.23.1/networking/zcip.c
--- busybox-1.23.1.orig/networking/zcip.c 2015-01-27 09:48:58.000000000 +0100
+++ busybox-1.23.1/networking/zcip.c 2016-04-13 15:36:12.255391459 +0200
@@ -521,7 +521,7 @@ int zcip_main(int argc UNUSED_PARAM, cha
target_ip_conflict = 0;
if (memcmp(&p.arp.arp_sha, &eth_addr, ETH_ALEN) != 0) {
- if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr))) {
+ if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr)) == 0) {
/* A probe or reply with source_ip == chosen ip */
source_ip_conflict = 1;
}

58
buildroot.octonet/patches/dvb-apps/dvb-apps-0002-Fix-broken-bitops-on-arm.patch Normal file
View File

@@ -0,0 +1,58 @@
diff -rup dvb-apps-83c746462ccb.orig/lib/libucsi/endianops.h dvb-apps-83c746462ccb/lib/libucsi/endianops.h
--- dvb-apps-83c746462ccb.orig/lib/libucsi/endianops.h 2012-12-06 10:38:07.000000000 +0100
+++ dvb-apps-83c746462ccb/lib/libucsi/endianops.h 2013-09-25 23:33:39.981233882 +0200
@@ -77,6 +77,8 @@ static inline void bswap48(uint8_t *buf)
#define EBIT7(x1,x2,x3,x4,x5,x6,x7) x7 x6 x5 x4 x3 x2 x1
#define EBIT8(x1,x2,x3,x4,x5,x6,x7,x8) x8 x7 x6 x5 x4 x3 x2 x1
+#if 0
+
static inline void bswap16(uint8_t * buf) {
*((uint16_t*)buf) = bswap_16((*(uint16_t*)buf));
}
@@ -89,6 +91,42 @@ static inline void bswap64(uint8_t * buf
*((uint64_t*)buf) = bswap_64((*(uint64_t*)buf));
}
+#else
+
+static inline void bswap16(uint8_t * buf) {
+ uint8_t tmp0 = buf[0];
+
+ buf[0] = buf[1];
+ buf[1] = tmp0;
+}
+
+static inline void bswap32(uint8_t * buf) {
+ uint8_t tmp0 = buf[0];
+ uint8_t tmp1 = buf[1];
+
+ buf[0] = buf[3];
+ buf[1] = buf[2];
+ buf[2] = tmp1;
+ buf[3] = tmp0;
+}
+
+static inline void bswap64(uint8_t * buf) {
+ uint8_t tmp0 = buf[0];
+ uint8_t tmp1 = buf[1];
+ uint8_t tmp2 = buf[2];
+ uint8_t tmp3 = buf[3];
+
+ buf[0] = buf[7];
+ buf[1] = buf[6];
+ buf[2] = buf[5];
+ buf[3] = buf[4];
+ buf[4] = tmp3;
+ buf[5] = tmp2;
+ buf[6] = tmp1;
+ buf[7] = tmp0;
+}
+#endif
+
static inline void bswap24(uint8_t * buf) {
uint8_t tmp0 = buf[0];
Binary files dvb-apps-83c746462ccb.orig/lib/libucsi/libucsi.a and dvb-apps-83c746462ccb/lib/libucsi/libucsi.a differ
Only in dvb-apps-83c746462ccb.orig/util/gnutv: .#gnutv.c
Only in dvb-apps-83c746462ccb.orig/util/gnutv: #gnutv.c#

12
buildroot.octonet/patches/dvb-apps/dvb-apps.perl-fix.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -rup ../../output-octonet.old/build/dvb-apps-3d43b280298c39a67d1d889e01e173f52c12da35/util/scan/Makefile dvb-apps-3d43b280298c39a67d1d889e01e173f52c12da35/util/scan/Makefile
--- ../../output-octonet.old/build/dvb-apps-3d43b280298c39a67d1d889e01e173f52c12da35/util/scan/Makefile 2016-08-18 16:14:43.996732820 +0200
+++ dvb-apps-3d43b280298c39a67d1d889e01e173f52c12da35/util/scan/Makefile 2016-11-15 18:40:08.830614417 +0100
@@ -25,6 +25,6 @@ $(binaries): $(objects)
$(objects): atsc_psip_section.c atsc_psip_section.h
atsc_psip_section.c atsc_psip_section.h:
- perl section_generate.pl atsc_psip_section.pl
+ perl section_generate.pl ./atsc_psip_section.pl
include ../../Make.rules
Only in dvb-apps-3d43b280298c39a67d1d889e01e173f52c12da35/util/scan: Makefile~

26
buildroot.octonet/patches/lzop/lzop-0001-ACC.patch Normal file
View File

@@ -0,0 +1,26 @@
--- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100
+++ a/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100
@@ -4469,12 +4469,12 @@
#if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
#elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
#else
- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0)
+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0)
#endif
ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0)
#if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
#else
- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0)
+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0)
#endif
ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0)
#if defined(acc_int16e_t)
@@ -4703,7 +4703,7 @@
#elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC)
#elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
#elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1)
- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
#endif
#if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560))
# pragma option pop