diff --git a/buildroot.octonet/configs/digitaldevices_octonet_defconfig b/buildroot.octonet/configs/digitaldevices_octonet_defconfig index d23c0fa..4e3b028 100644 --- a/buildroot.octonet/configs/digitaldevices_octonet_defconfig +++ b/buildroot.octonet/configs/digitaldevices_octonet_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_CCACHE=y BR2_PACKAGE_OVERRIDE_FILE="$(BR2_EXTERNAL)/board/digitaldevices/octonet/local.mk" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_PATH="$(TOPDIR)/output-octonet-tc/host/usr" diff --git a/busybox-0001-Fix-zcip-arp-compare.patch b/buildroot.octonet/patches/busybox/busybox-0001-Fix-zcip-arp-compare.patch similarity index 100% rename from busybox-0001-Fix-zcip-arp-compare.patch rename to buildroot.octonet/patches/busybox/busybox-0001-Fix-zcip-arp-compare.patch diff --git a/dvb-apps-0002-Fix-broken-bitops-on-arm.patch b/buildroot.octonet/patches/dvb-apps/dvb-apps-0002-Fix-broken-bitops-on-arm.patch similarity index 100% rename from dvb-apps-0002-Fix-broken-bitops-on-arm.patch rename to buildroot.octonet/patches/dvb-apps/dvb-apps-0002-Fix-broken-bitops-on-arm.patch diff --git a/buildroot.octonet/patches/dvb-apps/dvb-apps.perl-fix.patch b/buildroot.octonet/patches/dvb-apps/dvb-apps.perl-fix.patch new file mode 100644 index 0000000..e69bf4b --- /dev/null +++ b/buildroot.octonet/patches/dvb-apps/dvb-apps.perl-fix.patch @@ -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~ diff --git a/lzop-0001-ACC.patch b/buildroot.octonet/patches/lzop/lzop-0001-ACC.patch similarity index 100% rename from lzop-0001-ACC.patch rename to buildroot.octonet/patches/lzop/lzop-0001-ACC.patch diff --git a/mk.patch b/mk.patch index 449d4a4..e1bfede 100755 --- a/mk.patch +++ b/mk.patch @@ -13,9 +13,9 @@ if [ ! -e buildroot ]; then 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/ - cp busybox-0001-Fix-zcip-arp-compare.patch buildroot/package/busybox/ - cp lzop-0001-ACC.patch buildroot/package/lzop/ +# cp dvb-apps-0002-Fix-broken-bitops-on-arm.patch buildroot/package/dvb-apps/ +# cp busybox-0001-Fix-zcip-arp-compare.patch buildroot/package/busybox/ +# cp lzop-0001-ACC.patch buildroot/package/lzop/ if [ -e dl ]; then ln -sf ../dl buildroot fi diff --git a/octoserve/version.h b/octoserve/version.h index c865845..48b861f 100644 --- a/octoserve/version.h +++ b/octoserve/version.h @@ -19,5 +19,5 @@ #ifndef _OCTOSERVE_VERSION_ #define _OCTOSERVE_VERSION_ -#define OCTOSERVE_VERSION "1.0.74" +#define OCTOSERVE_VERSION "1.0.76" #endif