fixed EOL on scrips and patch files
This commit is contained in:
mvoelkel
parent
6eb38bb69b
commit
93f6f1da13
304
buildroot.patch
304
buildroot.patch
|
|
@ -1,152 +1,152 @@
|
|||
diff -uNr buildroot-2014.05/package/dvb-apps/dvb-apps-0002-Fix-broken-bitops-on-arm.patch buildroot-2014.05.octonet/package/dvb-apps/dvb-apps-0002-Fix-broken-bitops-on-arm.patch
|
||||
--- buildroot-2014.05/package/dvb-apps/dvb-apps-0002-Fix-broken-bitops-on-arm.patch 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ buildroot-2014.05.octonet/package/dvb-apps/dvb-apps-0002-Fix-broken-bitops-on-arm.patch 2014-12-20 19:01:42.491905787 +0100
|
||||
@@ -0,0 +1,63 @@
|
||||
+Binary files dvb-apps-83c746462ccb.orig/lib/libdvbapi/libdvbapi.a and dvb-apps-83c746462ccb/lib/libdvbapi/libdvbapi.a differ
|
||||
+Binary files dvb-apps-83c746462ccb.orig/lib/libdvbcfg/libdvbcfg.a and dvb-apps-83c746462ccb/lib/libdvbcfg/libdvbcfg.a differ
|
||||
+Binary files dvb-apps-83c746462ccb.orig/lib/libdvben50221/libdvben50221.a and dvb-apps-83c746462ccb/lib/libdvben50221/libdvben50221.a differ
|
||||
+Binary files dvb-apps-83c746462ccb.orig/lib/libdvbsec/libdvbsec.a and dvb-apps-83c746462ccb/lib/libdvbsec/libdvbsec.a differ
|
||||
+Binary files dvb-apps-83c746462ccb.orig/lib/libesg/libesg.a and dvb-apps-83c746462ccb/lib/libesg/libesg.a differ
|
||||
+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#
|
||||
diff -uNr buildroot-2014.05/package/linux-headers/Config.in.host buildroot-2014.05.octonet/package/linux-headers/Config.in.host
|
||||
--- buildroot-2014.05/package/linux-headers/Config.in.host 2014-05-31 09:52:49.000000000 +0200
|
||||
+++ buildroot-2014.05.octonet/package/linux-headers/Config.in.host 2014-12-20 19:03:58.370957507 +0100
|
||||
@@ -56,6 +56,10 @@
|
||||
bool "Linux 3.14.x kernel headers"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
|
||||
|
||||
+ config BR2_KERNEL_HEADERS_3_16
|
||||
+ bool "Linux 3.16.x kernel headers"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
|
||||
+
|
||||
config BR2_KERNEL_HEADERS_VERSION
|
||||
bool "Manually specified Linux version"
|
||||
endchoice
|
||||
@@ -77,6 +81,18 @@
|
||||
This is used to hide/show some packages that have strict
|
||||
requirements on the version of kernel headers.
|
||||
|
||||
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17
|
||||
+ bool "3.17.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
|
||||
+
|
||||
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_16
|
||||
+ bool "3.16.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
|
||||
+
|
||||
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_15
|
||||
+ bool "3.15.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
|
||||
+
|
||||
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14
|
||||
bool "3.14.x"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
|
||||
@@ -154,4 +170,7 @@
|
||||
default "3.12.20" if BR2_KERNEL_HEADERS_3_12
|
||||
default "3.13.11" if BR2_KERNEL_HEADERS_3_13
|
||||
default "3.14.4" if BR2_KERNEL_HEADERS_3_14
|
||||
+ default "3.15.6" if BR2_KERNEL_HEADERS_3_15
|
||||
+ default "3.16.7" if BR2_KERNEL_HEADERS_3_16
|
||||
+ default "3.17.7" if BR2_KERNEL_HEADERS_3_17
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
diff -uNr buildroot-2014.05/toolchain/toolchain-common.in buildroot-2014.05.octonet/toolchain/toolchain-common.in
|
||||
--- buildroot-2014.05/toolchain/toolchain-common.in 2014-05-31 09:52:49.000000000 +0200
|
||||
+++ buildroot-2014.05.octonet/toolchain/toolchain-common.in 2014-12-20 19:06:59.140337215 +0100
|
||||
@@ -180,6 +180,18 @@
|
||||
bool
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13
|
||||
|
||||
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
|
||||
+ bool
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
|
||||
+
|
||||
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
|
||||
+ bool
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
|
||||
+
|
||||
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
|
||||
+ bool
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
|
||||
+
|
||||
# This order guarantees that the highest version is set, as kconfig
|
||||
# stops affecting a value on the first matching default.
|
||||
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
|
||||
diff -uNr buildroot-2014.05/toolchain/toolchain-external/Config.in buildroot-2014.05.octonet/toolchain/toolchain-external/Config.in
|
||||
--- buildroot-2014.05/toolchain/toolchain-external/Config.in 2014-05-31 09:52:49.000000000 +0200
|
||||
+++ buildroot-2014.05.octonet/toolchain/toolchain-external/Config.in 2014-12-20 19:05:51.804843418 +0100
|
||||
@@ -1018,6 +1018,18 @@
|
||||
m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF
|
||||
p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF
|
||||
|
||||
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_17
|
||||
+ bool "3.17.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
|
||||
+
|
||||
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_16
|
||||
+ bool "3.16.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
|
||||
+
|
||||
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_15
|
||||
+ bool "3.15.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
|
||||
+
|
||||
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_14
|
||||
bool "3.14.x"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
|
||||
diff -uNr buildroot-2014.05/package/dvb-apps/dvb-apps-0002-Fix-broken-bitops-on-arm.patch buildroot-2014.05.octonet/package/dvb-apps/dvb-apps-0002-Fix-broken-bitops-on-arm.patch
|
||||
--- buildroot-2014.05/package/dvb-apps/dvb-apps-0002-Fix-broken-bitops-on-arm.patch 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ buildroot-2014.05.octonet/package/dvb-apps/dvb-apps-0002-Fix-broken-bitops-on-arm.patch 2014-12-20 19:01:42.491905787 +0100
|
||||
@@ -0,0 +1,63 @@
|
||||
+Binary files dvb-apps-83c746462ccb.orig/lib/libdvbapi/libdvbapi.a and dvb-apps-83c746462ccb/lib/libdvbapi/libdvbapi.a differ
|
||||
+Binary files dvb-apps-83c746462ccb.orig/lib/libdvbcfg/libdvbcfg.a and dvb-apps-83c746462ccb/lib/libdvbcfg/libdvbcfg.a differ
|
||||
+Binary files dvb-apps-83c746462ccb.orig/lib/libdvben50221/libdvben50221.a and dvb-apps-83c746462ccb/lib/libdvben50221/libdvben50221.a differ
|
||||
+Binary files dvb-apps-83c746462ccb.orig/lib/libdvbsec/libdvbsec.a and dvb-apps-83c746462ccb/lib/libdvbsec/libdvbsec.a differ
|
||||
+Binary files dvb-apps-83c746462ccb.orig/lib/libesg/libesg.a and dvb-apps-83c746462ccb/lib/libesg/libesg.a differ
|
||||
+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#
|
||||
diff -uNr buildroot-2014.05/package/linux-headers/Config.in.host buildroot-2014.05.octonet/package/linux-headers/Config.in.host
|
||||
--- buildroot-2014.05/package/linux-headers/Config.in.host 2014-05-31 09:52:49.000000000 +0200
|
||||
+++ buildroot-2014.05.octonet/package/linux-headers/Config.in.host 2014-12-20 19:03:58.370957507 +0100
|
||||
@@ -56,6 +56,10 @@
|
||||
bool "Linux 3.14.x kernel headers"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
|
||||
|
||||
+ config BR2_KERNEL_HEADERS_3_16
|
||||
+ bool "Linux 3.16.x kernel headers"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
|
||||
+
|
||||
config BR2_KERNEL_HEADERS_VERSION
|
||||
bool "Manually specified Linux version"
|
||||
endchoice
|
||||
@@ -77,6 +81,18 @@
|
||||
This is used to hide/show some packages that have strict
|
||||
requirements on the version of kernel headers.
|
||||
|
||||
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17
|
||||
+ bool "3.17.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
|
||||
+
|
||||
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_16
|
||||
+ bool "3.16.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
|
||||
+
|
||||
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_15
|
||||
+ bool "3.15.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
|
||||
+
|
||||
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14
|
||||
bool "3.14.x"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
|
||||
@@ -154,4 +170,7 @@
|
||||
default "3.12.20" if BR2_KERNEL_HEADERS_3_12
|
||||
default "3.13.11" if BR2_KERNEL_HEADERS_3_13
|
||||
default "3.14.4" if BR2_KERNEL_HEADERS_3_14
|
||||
+ default "3.15.6" if BR2_KERNEL_HEADERS_3_15
|
||||
+ default "3.16.7" if BR2_KERNEL_HEADERS_3_16
|
||||
+ default "3.17.7" if BR2_KERNEL_HEADERS_3_17
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
diff -uNr buildroot-2014.05/toolchain/toolchain-common.in buildroot-2014.05.octonet/toolchain/toolchain-common.in
|
||||
--- buildroot-2014.05/toolchain/toolchain-common.in 2014-05-31 09:52:49.000000000 +0200
|
||||
+++ buildroot-2014.05.octonet/toolchain/toolchain-common.in 2014-12-20 19:06:59.140337215 +0100
|
||||
@@ -180,6 +180,18 @@
|
||||
bool
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13
|
||||
|
||||
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
|
||||
+ bool
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
|
||||
+
|
||||
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
|
||||
+ bool
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
|
||||
+
|
||||
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
|
||||
+ bool
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
|
||||
+
|
||||
# This order guarantees that the highest version is set, as kconfig
|
||||
# stops affecting a value on the first matching default.
|
||||
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
|
||||
diff -uNr buildroot-2014.05/toolchain/toolchain-external/Config.in buildroot-2014.05.octonet/toolchain/toolchain-external/Config.in
|
||||
--- buildroot-2014.05/toolchain/toolchain-external/Config.in 2014-05-31 09:52:49.000000000 +0200
|
||||
+++ buildroot-2014.05.octonet/toolchain/toolchain-external/Config.in 2014-12-20 19:05:51.804843418 +0100
|
||||
@@ -1018,6 +1018,18 @@
|
||||
m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF
|
||||
p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF
|
||||
|
||||
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_17
|
||||
+ bool "3.17.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
|
||||
+
|
||||
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_16
|
||||
+ bool "3.16.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
|
||||
+
|
||||
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_15
|
||||
+ bool "3.15.x"
|
||||
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
|
||||
+
|
||||
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_14
|
||||
bool "3.14.x"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 4c7e7afc84bccf7b2cf36cafcec54ccaa25f751d
|
||||
|
|
@ -1,58 +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#
|
||||
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#
|
||||
|
|
|
|||
3414
linux.patch
3414
linux.patch
File diff suppressed because it is too large
Load Diff
102
mk
102
mk
|
|
@ -1,52 +1,50 @@
|
|||
cd buildroot
|
||||
rm output-octonet/images/octonet*
|
||||
rm output-octonet/build/linux-custom/.stamp_*
|
||||
|
||||
DDDVB=../dddvb
|
||||
LINUX=../linux.octonet
|
||||
|
||||
if [ -e /home/rjkm/projects ]; then
|
||||
rm -rf ../dddvb
|
||||
cp -rpdu /home/rjkm/projects/dddvb ../
|
||||
rm -rf ../octoserve
|
||||
cp -rpdu /home/rjkm/projects/octoserve ../
|
||||
fi
|
||||
|
||||
cp $DDDVB/ddbridge/*.[ch] $LINUX/drivers/media/pci/ddbridge/
|
||||
cp $DDDVB/dvb-core/*.[ch] $LINUX/drivers/media/dvb-core/
|
||||
cp $DDDVB/include/linux/dvb/*.h $LINUX/include/uapi/linux/dvb/
|
||||
|
||||
cp $DDDVB/frontends/drxk*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/lnb*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv0367dd*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv090x*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv6110*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/tda18*dd*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/cxd2099.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/cxd2843.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv6111.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv0910*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/mxl5xx.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/mxl5xx_regs.h $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/mxl5xx_defs.h $LINUX/drivers/media/dvb-frontends/
|
||||
|
||||
#cp $DDDVB/apps/ddtest.c package/octonet/octonet/
|
||||
#cp $DDDVB/apps/ddflash.c package/octonet/octonet/
|
||||
#cp $DDDVB/apps/octonet/octonet.c package/octonet/octonet/
|
||||
#cp $DDDVB/apps/octonet/octokey.c package/octonet/octonet/
|
||||
#cp $DDDVB/include/linux/dvb/ns.h package/octonet/octonet/
|
||||
rm -rf output-octonet/build/octonet*
|
||||
rm -rf output-octonet/build/octoserve*
|
||||
|
||||
#chmod 577 board/digitaldevices/octonet/overlay/var/dms/dms.lua
|
||||
#chmod 577 board/digitaldevices/octonet/overlay/var/mcsetup/mcsetup.lua
|
||||
|
||||
make BR2_EXTERNAL=../buildroot.octonet O=output-octonet digitaldevices_octonet_defconfig
|
||||
make O=output-octonet
|
||||
|
||||
TS=`date +%y%m%d%H%M`
|
||||
echo $TS
|
||||
#xz -kf output-octonet/images/rootfs.tar
|
||||
#cp output-octonet/images/rootfs.tar.xz output-octonet/images/octonet.`date +%y%m%d%H%M`.img
|
||||
cp output-octonet/images/rootfs.tar.bz2 output-octonet/images/octonet.`date +%y%m%d%H%M`.img
|
||||
sha256sum output-octonet/images/octonet.`date +%y%m%d%H%M`.img > output-octonet/images/octonet.`date +%y%m%d%H%M`.sha
|
||||
cd buildroot
|
||||
rm output-octonet/images/octonet*
|
||||
rm output-octonet/build/linux-custom/.stamp_*
|
||||
|
||||
DDDVB=../dddvb
|
||||
LINUX=../linux.octonet
|
||||
|
||||
if [ -e /home/rjkm/projects ]; then
|
||||
rm -rf ../dddvb
|
||||
cp -rpdu /home/rjkm/projects/dddvb ../
|
||||
rm -rf ../octoserve
|
||||
cp -rpdu /home/rjkm/projects/octoserve ../
|
||||
fi
|
||||
|
||||
cp $DDDVB/ddbridge/*.[ch] $LINUX/drivers/media/pci/ddbridge/
|
||||
cp $DDDVB/dvb-core/*.[ch] $LINUX/drivers/media/dvb-core/
|
||||
cp $DDDVB/include/linux/dvb/*.h $LINUX/include/uapi/linux/dvb/
|
||||
|
||||
cp $DDDVB/frontends/drxk*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/lnb*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv0367dd*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv090x*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv6110*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/tda18*dd*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/cxd2099.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/cxd2843.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv6111.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv0910*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/mxl5xx.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/mxl5xx_regs.h $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/mxl5xx_defs.h $LINUX/drivers/media/dvb-frontends/
|
||||
|
||||
#cp $DDDVB/apps/ddtest.c package/octonet/octonet/
|
||||
#cp $DDDVB/apps/ddflash.c package/octonet/octonet/
|
||||
#cp $DDDVB/apps/octonet/octonet.c package/octonet/octonet/
|
||||
#cp $DDDVB/apps/octonet/octokey.c package/octonet/octonet/
|
||||
#cp $DDDVB/include/linux/dvb/ns.h package/octonet/octonet/
|
||||
rm -rf output-octonet/build/octonet*
|
||||
rm -rf output-octonet/build/octoserve*
|
||||
|
||||
#chmod 577 board/digitaldevices/octonet/overlay/var/dms/dms.lua
|
||||
#chmod 577 board/digitaldevices/octonet/overlay/var/mcsetup/mcsetup.lua
|
||||
|
||||
make BR2_EXTERNAL=../buildroot.octonet O=output-octonet digitaldevices_octonet_defconfig
|
||||
make O=output-octonet
|
||||
|
||||
TS=`date +%y%m%d%H%M`
|
||||
echo $TS
|
||||
cp output-octonet/images/rootfs.tar.bz2 output-octonet/images/octonet.$TS.img
|
||||
sha256sum output-octonet/images/octonet.$TS.img > output-octonet/images/octonet.$TS.sha
|
||||
|
|
|
|||
5
mk.all
5
mk.all
|
|
@ -5,3 +5,8 @@ make BR2_EXTERNAL=../buildroot.octonet O=output-octonet-init digitaldevices_octo
|
|||
make BR2_EXTERNAL=../buildroot.octonet O=output-octonet-init
|
||||
make BR2_EXTERNAL=../buildroot.octonet O=output-octonet digitaldevices_octonet_defconfig
|
||||
make BR2_EXTERNAL=../buildroot.octonet O=output-octonet
|
||||
|
||||
TS=`date +%y%m%d%H%M`
|
||||
echo $TS
|
||||
cp output-octonet/images/rootfs.tar.bz2 output-octonet/images/octonet.$TS.img
|
||||
sha256sum output-octonet/images/octonet.$TS.img > output-octonet/images/octonet.$TS.sha
|
||||
|
|
|
|||
128
mk.patch
128
mk.patch
|
|
@ -1,64 +1,64 @@
|
|||
if [ ! -e linux.octonet ]; then
|
||||
if [ ! -e linux-3.17.7.tar.xz ]; then
|
||||
wget https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.17.7.tar.xz
|
||||
fi
|
||||
tar xf linux-3.17.7.tar.xz
|
||||
mv linux-3.17.7 linux.octonet
|
||||
patch -d linux.octonet -p1 < linux.patch
|
||||
fi
|
||||
|
||||
if [ ! -e buildroot ]; then
|
||||
if [ ! -e buildroot-2015.02-rc2.tar.bz2 ]; then
|
||||
wget http://buildroot.uclibc.org/downloads/buildroot-2015.02-rc2.tar.bz2
|
||||
fi
|
||||
tar xf buildroot-2015.02-rc2.tar.bz2
|
||||
mv buildroot-2015.02-rc2 buildroot
|
||||
cp dvb-apps-0002-Fix-broken-bitops-on-arm.patch buildroot/package/dvb-apps/
|
||||
if [ -e dl ]; then
|
||||
ln -sf ../dl buildroot
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -e buildroot.octonet ]; then
|
||||
tar xf buildroot.octonet.tar.xz
|
||||
fi
|
||||
|
||||
if [ ! -e dddvb ]; then
|
||||
tar xf dddvb.tar.xz
|
||||
fi
|
||||
|
||||
if [ ! -e octoserve ]; then
|
||||
tar xf octoserve.tar.xz
|
||||
fi
|
||||
|
||||
|
||||
DDDVB=dddvb
|
||||
LINUX=linux.octonet
|
||||
|
||||
cp $DDDVB/ddbridge/*.[ch] $LINUX/drivers/media/pci/ddbridge/
|
||||
cp $DDDVB/dvb-core/*.[ch] $LINUX/drivers/media/dvb-core/
|
||||
cp $DDDVB/include/linux/dvb/*.h $LINUX/include/uapi/linux/dvb/
|
||||
|
||||
cp $DDDVB/frontends/drxk*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/lnb*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv0367dd*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv090x*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv6110*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/tda18*dd*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/cxd2099.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/cxd2843.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv6111.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv0910*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/mxl5xx*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
|
||||
|
||||
if [ ! -e u-boot ]; then
|
||||
if [ ! -e u-boot-2014.07.tar.bz2 ]; then
|
||||
wget ftp://ftp.denx.de/pub/u-boot/u-boot-2014.07.tar.bz2
|
||||
fi
|
||||
tar xf u-boot-2014.07.tar.bz2
|
||||
mv u-boot-2014.07 u-boot
|
||||
patch -d u-boot -p1 < u-boot.patch
|
||||
fi
|
||||
|
||||
|
||||
if [ ! -e linux.octonet ]; then
|
||||
if [ ! -e linux-3.17.7.tar.xz ]; then
|
||||
wget https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.17.7.tar.xz
|
||||
fi
|
||||
tar xf linux-3.17.7.tar.xz
|
||||
mv linux-3.17.7 linux.octonet
|
||||
patch -d linux.octonet -p1 < linux.patch
|
||||
fi
|
||||
|
||||
if [ ! -e buildroot ]; then
|
||||
if [ ! -e buildroot-2015.02-rc2.tar.bz2 ]; then
|
||||
wget http://buildroot.uclibc.org/downloads/buildroot-2015.02-rc2.tar.bz2
|
||||
fi
|
||||
tar xf buildroot-2015.02-rc2.tar.bz2
|
||||
mv buildroot-2015.02-rc2 buildroot
|
||||
cp dvb-apps-0002-Fix-broken-bitops-on-arm.patch buildroot/package/dvb-apps/
|
||||
if [ -e dl ]; then
|
||||
ln -sf ../dl buildroot
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -e buildroot.octonet ]; then
|
||||
tar xf buildroot.octonet.tar.xz
|
||||
fi
|
||||
|
||||
if [ ! -e dddvb ]; then
|
||||
tar xf dddvb.tar.xz
|
||||
fi
|
||||
|
||||
if [ ! -e octoserve ]; then
|
||||
tar xf octoserve.tar.xz
|
||||
fi
|
||||
|
||||
|
||||
DDDVB=dddvb
|
||||
LINUX=linux.octonet
|
||||
|
||||
cp $DDDVB/ddbridge/*.[ch] $LINUX/drivers/media/pci/ddbridge/
|
||||
cp $DDDVB/dvb-core/*.[ch] $LINUX/drivers/media/dvb-core/
|
||||
cp $DDDVB/include/linux/dvb/*.h $LINUX/include/uapi/linux/dvb/
|
||||
|
||||
cp $DDDVB/frontends/drxk*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/lnb*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv0367dd*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv090x*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv6110*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/tda18*dd*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/cxd2099.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/cxd2843.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv6111.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/stv0910*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
cp $DDDVB/frontends/mxl5xx*.[ch] $LINUX/drivers/media/dvb-frontends/
|
||||
|
||||
|
||||
if [ ! -e u-boot ]; then
|
||||
if [ ! -e u-boot-2014.07.tar.bz2 ]; then
|
||||
wget ftp://ftp.denx.de/pub/u-boot/u-boot-2014.07.tar.bz2
|
||||
fi
|
||||
tar xf u-boot-2014.07.tar.bz2
|
||||
mv u-boot-2014.07 u-boot
|
||||
patch -d u-boot -p1 < u-boot.patch
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue