From 0dda94124a2f33464227a1c68ef242303b3a7f39 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 22 Feb 2021 22:22:59 +0100 Subject: [PATCH] - minor reworks --- Makefile | 2 +- config.example | 2 +- make/buildsystem-bootstrap.mk | 14 +- make/buildsystem-helpers.mk | 176 +- make/buildsystem-prerequisites.mk | 72 +- make/buildsystem-update.mk | 108 +- make/buildsystem-utils.mk | 50 +- make/crosstool.mk | 50 +- make/environment-build.mk | 314 +-- make/environment-image.mk | 12 +- make/environment-linux.mk | 124 +- make/environment-update.mk | 6 +- make/flash-images.mk | 2 +- make/flash-updates.mk | 44 +- make/host-tools.mk | 376 +-- make/linux-drivers.mk | 40 +- make/linux-kernel.mk | 76 +- make/ni.mk | 16 +- make/target-blobs.mk | 450 ++-- make/target-development.mk | 102 +- make/target-ffmpeg-coolstream.mk | 314 ++- make/target-ffmpeg.mk | 653 +++-- make/target-files.mk | 2 +- make/target-libs-static.mk | 47 +- make/target-libs-unused.mk | 184 +- make/target-libs.mk | 1356 +++++------ make/target-lua.mk | 139 +- make/target-neutrino-plugins.mk | 187 +- make/target-neutrino.mk | 70 +- make/target-rootfs.mk | 26 +- make/target-tools-unused.mk | 243 +- make/target-tools.mk | 2126 ++++++++--------- .../alsa-lib/patches}/0000-alsa_pc_in.patch | 0 ...01-Don-t-use-fork-on-noMMU-platforms.patch | 0 .../patches/0000-force-STRIP-to-emtpy.patch | 0 .../patches}/0000-align-root.patch | 0 .../patches}/0005-disable-docs.patch | 0 .../bash => package/bash/patches}/bash50-001 | 0 .../bash => package/bash/patches}/bash50-002 | 0 .../bash => package/bash/patches}/bash50-003 | 0 .../bash => package/bash/patches}/bash50-004 | 0 .../bash => package/bash/patches}/bash50-005 | 0 .../bash => package/bash/patches}/bash50-006 | 0 .../bash => package/bash/patches}/bash50-007 | 0 .../bash => package/bash/patches}/bash50-008 | 0 .../bash => package/bash/patches}/bash50-009 | 0 .../bash => package/bash/patches}/bash50-010 | 0 .../bash => package/bash/patches}/bash50-011 | 0 .../bash => package/bash/patches}/bash50-012 | 0 .../bash => package/bash/patches}/bash50-013 | 0 .../bash => package/bash/patches}/bash50-014 | 0 .../bash => package/bash/patches}/bash50-015 | 0 .../bash => package/bash/patches}/bash50-016 | 0 .../bash => package/bash/patches}/bash50-017 | 0 .../busybox/files}/busybox-minimal.config | 0 .../patches}/busybox-fix-config-header.diff | 0 .../patches}/busybox-fix-partition-size.patch | 0 .../patches}/busybox-insmod-hack.patch | 0 .../patches}/busybox-mount_single_uuid.patch | 0 .../bzip2/patches}/bzip2.patch | 0 .../patches}/cairo-get_bitmap_surface.diff | 0 .../patches}/coreutils-fix-build.patch | 0 .../crosstool-ng/files}/ct-ng-armbox.config | 0 .../files}/ct-ng-coolstream-hd1.config | 0 .../files}/ct-ng-coolstream-hd2.config | 0 .../crosstool-ng/files}/ct-ng-mipsbox.config | 0 .../files}/ct-ng-uClibc-1.0.24.config | 0 .../patches}/crosstool-ng-bash-version.patch | 0 ...of-check-for-empty-string-in-ubsan.c.patch | 0 .../djmount-fix-hang-with-asset-upnp.patch | 0 ...nge-when-retrieving-content-via-HTTP.patch | 0 .../patches}/djmount-fix-new-autotools.diff | 0 .../patches}/djmount-fix-newer-gcc.patch | 0 ...fixed-crash-when-using-UTF-8-charset.patch | 0 .../patches}/djmount-fixed-crash.patch | 0 .../djmount-support-fstab-mounting.diff | 0 ...t-support-seeking-in-large-2gb-files.patch | 0 ..._CHECK_LIB-for-iconv-library-linking.patch | 0 .../patches}/0001-Fix-generate-keynames.patch | 0 ...ate-Remove-Obsoleted-stime-API-calls.patch | 0 ...0003-handle-static-shared-only-build.patch | 0 .../patches}/0004-Makefile-remove-test.patch | 0 .../0005-libucsi-optimization-removal.patch | 0 .../dvb-apps/patches}/0006-CA_SET_PID.patch | 0 .../expat/patches}/expat-libtool-tag.patch | 0 .../ext4_utils/patches}/ext4_utils.mk | 0 .../fbshot/patches}/fbshot-32bit_cs_fb.diff | 0 .../fbshot/patches}/fbshot_cs_hd2.diff | 0 .../ffmpeg/patches}/4_02_fix_mpegts.patch | 0 ...allow_to_choose_rtmp_impl_at_runtime.patch | 0 .../patches}/4_04_hls_replace_key_uri.patch | 0 .../ffmpeg/patches}/4_06_optimize_aac.patch | 0 .../patches}/4_07_increase_buffer_size.patch | 0 .../patches}/4_08_recheck_discard_flags.patch | 0 .../4_09_ffmpeg_fix_edit_list_parsing.patch | 0 .../ffmpeg/patches}/4_10_rtsp_patch | 0 .../ffmpeg/patches}/4_11_dxva2_patch | 0 .../patches}/4_A02-corrupt-h264-frames.patch | 0 ...fenc-Add-support-for-pict_type-field.patch | 0 .../patches}/4_mips64_cpu_detection.patch | 0 .../freetype2/patches}/freetype2-config.patch | 0 .../patches}/freetype2-pkgconf.patch | 0 .../patches}/freetype2-subpixel.patch | 0 .../glib2/patches}/glib2-automake.patch | 0 .../glib2/patches}/glib2-disable-tests.patch | 0 .../gptfdisk/patches}/gptfdisk-ldlibs.patch | 0 .../patches}/0003-strip-graphlcd-conf.patch | 0 .../patches}/0004-material-colors.patch | 0 .../patches}/0005-add-vuplus-driver.patch | 0 .../graphlcd-base/patches}/graphlcd.patch | 0 .../patches}/harfbuzz-disable-docs.patch | 0 .../patches}/hi3798mv200-support.patch | 0 .../hdparm/patches}/0001-cflags.patch | 0 .../patches}/iperf-disable-profiling.patch | 0 .../files}/initramfs-subdirboot.cpio.gz | Bin .../kernel/files/kernel-apollo.defconfig | 0 .../kernel/files/kernel-hd5x.defconfig | 0 .../kernel/files/kernel-hd6x.defconfig | 0 .../kernel/files/kernel-kronos.defconfig | 0 .../kernel/files/kernel-nevis.defconfig | 0 .../kernel/files/kernel-vuduo.defconfig | 0 .../kernel/files/kernel-vuduo4k.defconfig | 0 .../kernel/files/kernel-vuduo4kse.defconfig | 0 .../kernel/files/kernel-vusolo4k.defconfig | 0 .../kernel/files/kernel-vuultimo4k.defconfig | 0 .../kernel/files/kernel-vuuno4k.defconfig | 0 .../kernel/files/kernel-vuuno4kse.defconfig | 0 .../kernel/files/kernel-vuzero4k.defconfig | 0 .../4_10_0001-export_pmpoweroffprepare.patch | 0 .../4_10_0002-TBS-fixes-for-4.10-kernel.patch | 0 ...pport-TBS-USB-drivers-for-4.6-kernel.patch | 0 .../4_10_0004-TBS-fixes-for-4.6-kernel.patch | 0 .../4_10_0005-STV-Add-PLS-support.patch | 0 ...STV-Add-SNR-Signal-report-parameters.patch | 0 .../gfutures/4_10_0007-blindscan2.patch | 0 ...07-stv090x-optimized-TS-sync-control.patch | 0 .../4_10_add-more-devices-rtl8xxxu.patch | 0 .../patches}/gfutures/4_10_bitsperlong.patch | 0 .../gfutures/4_10_blacklist_mmc0.patch | 0 .../patches}/gfutures/4_10_dvbs2x.patch | 0 .../gfutures/4_10_reserve_dvb_adapter_0.patch | 0 .../patches}/gfutures/4_10_t230c2.patch | 0 .../patches}/gfutures/4_4_0001-remote.patch | 0 ...ive-up-on-gcc-constant-optimizations.patch | 0 ...4_4_0003-dont-mark-register-as-const.patch | 0 ...211-increase-scan-result-expire-time.patch | 0 .../3_14_0001-STV-Add-PLS-support.patch | 0 ...STV-Add-SNR-Signal-report-parameters.patch | 0 .../3_14_0001-Support-TBS-USB-drivers.patch | 0 ...01-stv090x-optimized-TS-sync-control.patch | 0 ...tuners-tda18273-silicon-tuner-driver.patch | 0 ...14_0003-cxusb-Geniatech-T230-support.patch | 0 ...ive-up-on-gcc-constant-optimizations.patch | 0 ...-uaccess-dont-mark-register-as-const.patch | 0 .../3_14_0006-makefile-disable-warnings.patch | 0 ...con-Labs-Si2157-silicon-tuner-driver.patch | 0 ...-Labs-Si2168-DVB-T-T2-C-demod-driver.patch | 0 .../patches}/vuplus/3_14_CONFIG_DVB_SP2.patch | 0 .../vuplus/3_14_bcm_genet_disable_warn.patch | 0 .../vuplus/3_14_bcmsysport_3.14.28-1.12.patch | 0 .../patches}/vuplus/3_14_blindscan2.patch | 0 .../patches}/vuplus/3_14_dmx_source_dvr.patch | 0 .../kernel/patches}/vuplus/3_14_dvbs2x.patch | 0 .../kernel/patches}/vuplus/3_14_dvbsky.patch | 0 .../vuplus/3_14_fix_mmc_3.14.28-1.10.patch | 0 .../3_14_genksyms_fix_typeof_handling.patch | 0 .../3_14_kernel-add-support-for-gcc6.patch | 0 .../3_14_kernel-add-support-for-gcc7.patch | 0 .../3_14_kernel-add-support-for-gcc8.patch | 0 .../3_14_kernel-add-support-for-gcc9.patch | 0 .../patches}/vuplus/3_14_linux_dvb-core.patch | 0 .../vuplus/3_14_linux_dvb_adapter.patch | 0 ...3_14_linux_prevent_usb_dma_from_bmem.patch | 0 .../vuplus/3_14_linux_rpmb_not_alloc.patch | 0 ...sb_fix_warn_tx_status_timeout_to_dbg.patch | 0 .../patches}/vuplus/3_14_rtl2832u-2.patch | 0 .../vuplus/3_14_rtl8712_fix_build_error.patch | 0 .../vuplus/3_14_usb_core_hub_msleep.patch | 0 .../vuplus/3_9_0001-STV-Add-PLS-support.patch | 0 ...STV-Add-SNR-Signal-report-parameters.patch | 0 ...3_9_0001-Support-TBS-USB-drivers-3.9.patch | 0 ...001-rt2800usb-add-support-for-rt55xx.patch | 0 ...01-stv090x-optimized-TS-sync-control.patch | 0 ...con-Labs-Si2157-silicon-tuner-driver.patch | 0 ...-Labs-Si2168-DVB-T-T2-C-demod-driver.patch | 0 .../patches}/vuplus/3_9_CONFIG_DVB_SP2.patch | 0 .../vuplus/3_9_add-dmx-source-timecode.patch | 0 .../3_9_af9015-output-full-range-SNR.patch | 0 .../3_9_af9033-output-full-range-SNR.patch | 0 ..._as102-adjust-signal-strength-report.patch | 0 .../3_9_as102-scale-MER-to-full-range.patch | 0 .../patches}/vuplus/3_9_blindscan2.patch | 0 .../vuplus/3_9_cinergy_s2_usb_r2.patch | 0 .../3_9_cxd2820r-output-full-range-SNR.patch | 0 .../3_9_dvb-usb-dib0700-disable-sleep.patch | 0 .../3_9_dvb_usb_disable_rc_polling.patch | 0 .../patches}/vuplus/3_9_dvbsky-t330.patch | 0 .../vuplus/3_9_fix-dvb-siano-sms-order.patch | 0 .../3_9_fix_fuse_for_linux_mips_3-9.patch | 0 .../patches}/vuplus/3_9_fixed_mtd.patch | 0 .../3_9_genksyms_fix_typeof_handling.patch | 0 ...13x-switch-off-PID-filter-by-default.patch | 0 .../3_9_kernel-add-support-for-gcc5.patch | 0 .../3_9_kernel-add-support-for-gcc6.patch | 0 .../3_9_kernel-add-support-for-gcc7.patch | 0 .../3_9_kernel-add-support-for-gcc8.patch | 0 .../3_9_kernel-add-support-for-gcc9.patch | 0 ...inux-3.9-gcc-4.9.3-build-error-fixed.patch | 0 .../patches}/vuplus/3_9_linux-sata_bcm.patch | 0 ...add-no_probe-and-no_reset-parameters.patch | 0 .../vuplus/3_9_nfs-max-rwsize-8k.patch | 0 ...sb_fix_warn_tx_status_timeout_to_dbg.patch | 0 .../vuplus/3_9_rtl8187se-fix-warnings.patch | 0 .../vuplus/3_9_rtl8712-fix-warnings.patch | 0 ..._tda18271-advertise-supported-delsys.patch | 0 .../kernel/patches}/vuplus/3_9_test.patch | 0 .../vuplus/4_1_0001-STV-Add-PLS-support.patch | 0 ...STV-Add-SNR-Signal-report-parameters.patch | 0 ...pport-TBS-USB-drivers-for-4.1-kernel.patch | 0 .../4_1_0001-TBS-fixes-for-4.1-kernel.patch | 0 .../vuplus/4_1_0001-dvb-usb-fix-a867.patch | 0 ..._1_0001-regmap-add-regmap_write_bits.patch | 0 ...01-stv090x-optimized-TS-sync-control.patch | 0 ...2-af9035-fix-device-order-in-ID-list.patch | 0 ...ive-up-on-gcc-constant-optimizations.patch | 0 ...dvb-usb-stick-Hauppauge-WinTV-soloHD.patch | 0 ...-uaccess-dont-mark-register-as-const.patch | 0 ...ID-07ca-0337-AVerMedia-HD-Volar-A867.patch | 0 ...Add-support-for-EVOLVEO-XtraTV-stick.patch | 0 ...d-support-for-Mygica-Geniatech-S2870.patch | 0 ...ID-for-another-STK8096-PVR-ref-desig.patch | 0 ...-add-Hama-Hybrid-DVB-T-Stick-support.patch | 0 ...ratec-H7-Revision-4-to-DVBSky-driver.patch | 0 ...ort-for-the-TerraTec-T1-DVB-T-USB-tu.patch | 0 ...a18250-support-for-new-silicon-tuner.patch | 0 ...d-support-for-Xbox-One-Digital-TV-Tu.patch | 0 ...72-Fix-possible-leak-in-mn88472_init.patch | 0 ...ng-media-Remove-unneeded-parentheses.patch | 0 ...ng-media-mn88472-simplify-NULL-tests.patch | 0 .../vuplus/4_1_0016-mn88472-fix-typo.patch | 0 .../4_1_0017-mn88472-finalize-driver.patch | 0 .../vuplus/4_1_bcmgenet-recovery-fix.patch | 0 .../vuplus/4_1_bcmsysport_4_1_45.patch | 0 .../patches}/vuplus/4_1_blindscan2.patch | 0 .../patches}/vuplus/4_1_dmx_source_dvr.patch | 0 .../4_1_kernel-add-support-for-gcc6.patch | 0 .../4_1_kernel-add-support-for-gcc7.patch | 0 .../4_1_kernel-add-support-for-gcc8.patch | 0 .../4_1_kernel-add-support-for-gcc9.patch | 0 .../vuplus/4_1_linux_4_1_45_dvbs2x.patch | 0 .../patches}/vuplus/4_1_linux_dvb-core.patch | 0 .../vuplus/4_1_linux_dvb_adapter.patch | 0 .../vuplus/4_1_linux_rpmb_not_alloc.patch | 0 .../patches}/vuplus/4_1_linux_usb_hub.patch | 0 .../libass/patches}/libass.patch | 0 .../libbluray/patches}/libbluray.patch | 0 .../libdpf/patches}/libdpf-crossbuild.patch | 4 +- ...vbsi++-content_identifier_descriptor.patch | 0 ...-Fix-installation-location-of-libffi.patch | 0 ...Fix-use-of-compact-eh-frames-on-MIPS.patch | 0 ...-hardfloat-in-the-MIPS-assembly-code.patch | 0 ...pc.h-fix-build-failure-with-powerpc7.patch | 0 ...ix-build-failure-on-power7-and-older.patch | 0 ...6-Address-platforms-with-no-__int128.patch | 0 ...y-to-help-platforms-with-no-__int128.patch | 0 .../libid3tag/patches}/libid3tag-pc.patch | 0 .../patches}/libjpeg-turbo-tiff-ojpeg.patch | 0 .../libmad/patches}/libmad-frame_length.diff | 0 .../libmad-mips-h-constraint-removal.patch | 0 .../libmad/patches}/libmad-pc.patch | 0 .../libmad-remove-deprecated-cflags.patch | 0 .../patches}/libmad-thumb2-fixed-arm.patch | 0 .../patches}/libmad-thumb2-imdct-arm.patch | 0 ...bpng-Disable-pngfix-and-png-fix-itxt.patch | 0 ...parts-of-TIRPC-requiring-NIS-support.patch | 0 ...nerate-XDR-header-files-from-.x-sour.patch | 0 ...es-needed-to-build-rpcbind-on-top-of.patch | 0 .../0001-fix-a-build-issue-on-linux.patch | 0 ...e-loop-in-xmlStringLenDecodeEntities.patch | 0 ...mory-leak-in-xmlSchemaValidateStream.patch | 0 .../links/patches}/links-ac-prog-cxx.patch | 0 .../patches}/links-accept_https_play.patch | 0 .../links/patches}/links-input-event1.patch | 0 .../links/patches}/links-input-event2.patch | 0 .../links/patches}/links-input-nevis_ir.patch | 0 .../links/patches}/links.patch | 0 .../lua-curl/patches}/lua-curl-Makefile.diff | 0 .../patches}/lua-feedparser.patch | 0 .../lua/patches}/lua-01-fix-LUA_ROOT.patch | 0 .../lua/patches}/lua-01-remove-readline.patch | 0 .../patches}/lua-02-shared-libs-for-lua.patch | 0 .../lua/patches}/lua-03-lua-pc.patch | 0 .../lua/patches}/lua-04-crashfix.diff | 0 .../luaexpat/patches}/luaexpat-makefile.patch | 0 .../patches}/luaposix-fix-docdir-build.patch | 0 .../luarocks/files}/luarocks-config.lua | 0 ...rocks-0001-allow-libluajit-detection.patch | 0 ...-mc-replace-perl-w-with-use-warnings.patch | 0 .../mc/patches}/0002-nomandate.patch | 0 .../mc/patches}/0003-subshell.patch | 0 ...04-fix-mouse-handling-newer-terminfo.patch | 0 ...tic-libs-when-default-library-static.patch | 0 ...dencies-base.py-add-pkg_config_stati.patch | 0 ...inicom-fix-h-v-return-value-is-not-0.patch | 0 .../patches}/0001-change-bootid-path.patch | 0 .../patches}/ncurses-gcc-5.x-MKlib_gen.patch | 0 ...nfs-utils_01-Patch-taken-from-Gentoo.patch | 0 ...tch-legacy-index-in-favour-of-strchr.patch | 0 ...e-script-find-getrpcbynumber-in-libt.patch | 0 ...ntd-Add-check-for-struct-file_handle.patch | 0 .../0001-set-minimum-cmake-version.patch | 0 ...fdiagnostics-color-from-make-command.patch | 0 .../0003-CMake-fix-object-library-usage.patch | 0 ...an-error-when-failed-to-build-the-mo.patch | 0 .../ntp/patches}/0001-mkver_in.patch | 0 .../0000-Configure-align-O-flag.patch | 0 ...-workarounds-in-cpu-features-detecti.patch | 0 ...-for-FE_INVALID-definition-before-us.patch | 0 .../pixman/patches}/pixman-asm_include.patch | 0 ...th-the-sysroot-a-subset-of-variables.patch | 0 .../patches}/procps-ng-no-tests-docs.patch | 0 .../pugixml/patches}/pugixml-config.patch | 0 .../patches}/0001-add-executable.patch | 0 .../0002-change-shebang-to-python3.patch | 0 ...e-the-build-of-pyc-files-conditional.patch | 0 ...taddrinfo-configure-test-when-cross-.patch | 0 ...re-to-disable-the-build-of-certain-e.patch | 0 ...y-header-paths-for-cross-compilation.patch | 0 ...ook-in-usr-lib-termcap-for-libraries.patch | 0 .../0006-Don-t-add-multiarch-paths.patch | 0 .../0007-Abort-on-failed-module-build.patch | 0 .../0008-Serial-ioctl-workaround.patch | 0 ...e-shebang-of-Python-scripts-for-cros.patch | 0 ...ig.sh.in-ensure-sed-invocations-only.patch | 0 ...locale-and-set-to-default-when-addin.patch | 0 ...Add-importlib-fix-for-PEP-3147-issue.patch | 0 ...-disable-installation-of-test-module.patch | 0 .../0014-Add-an-option-to-disable-pydoc.patch | 0 ...015-Add-an-option-to-disable-lib2to3.patch | 0 ...option-to-disable-the-sqlite3-module.patch | 0 ...d-an-option-to-disable-the-tk-module.patch | 0 ...-option-to-disable-the-curses-module.patch | 0 .../0019-Add-an-option-to-disable-expat.patch | 0 ...-Add-an-option-to-disable-CJK-codecs.patch | 0 .../0021-Add-an-option-to-disable-NIS.patch | 0 ...Add-an-option-to-disable-unicodedata.patch | 0 .../0023-Add-an-option-to-disable-IDLE.patch | 0 ...024-Add-an-option-to-disable-decimal.patch | 0 ...on-to-disable-the-ossaudiodev-module.patch | 0 ...an-option-to-disable-openssl-support.patch | 0 ...ption-to-disable-the-readline-module.patch | 0 ...to-disable-zlib-bzip2-and-xz-modules.patch | 0 ...thon-config.sh-don-t-reassign-prefix.patch | 0 ...-Fix-cross-compiling-the-uuid-module.patch | 0 ...Add-an-option-to-disable-uuid-module.patch | 0 ...-fix-building-on-older-distributions.patch | 0 ...up-CC-print-multiarch-output-for-mus.patch | 0 ...-ng-doesn-t-set-errno-when-encryptio.patch | 0 ...ind-0001-Remove-yellow-pages-support.patch | 0 ...d-0002-add_option_to_fix_port_number.patch | 0 .../patches}/0001-rt8812au-gcc5.patch | 0 ...rt8812au-Add-support-for-kernels-4.8.patch | 0 .../0001-add-linux-4.19-support.patch | 0 .../0002-add-linux-4.20-support.patch | 0 .../patches}/0003-add-linux-5.0-support.patch | 0 .../patches}/0004-add-linux-5.1-support.patch | 0 .../patches}/0005-add-linux-5.2-support.patch | 0 .../samba33/files}/samba33-config.site | 0 .../samba33-build-only-what-we-need.patch | 0 ...e-getgrouplist_ok-test-cross-compile.patch | 0 .../samba36/files}/samba36-config.site | 0 .../patches}/samba36-CVE-2016-2112-v3-6.patch | 20 +- .../patches}/samba36-CVE-2016-2115-v3-6.patch | 24 +- .../patches}/samba36-CVE-2017-7494-v3-6.patch | 4 +- .../samba36-build-only-what-we-need.patch | 0 .../patches}/samba36-remove_ad_support.patch | 0 .../samba36-remove_printer_support.patch | 0 .../samba36-remove_registry_backend.patch | 0 .../patches}/samba36-remove_services.patch | 0 .../samba36-remove_winreg_support.patch | 0 .../patches}/samba36-strip_srvsvc.patch | 0 .../sysvinit/patches}/change-INIT_FIFO.patch | 0 .../sysvinit/patches}/crypt-lib.patch | 0 .../usbutils-avoid-dependency-on-bash.patch | 0 .../usbutils-fix-null-pointer-crash.patch | 0 .../patches}/ushare-disable-iconv-check.patch | 0 .../ushare-fix-building-with-gcc-5.x.patch | 0 .../ushare/patches}/ushare.diff | 0 .../patches}/valgrind-fix-build-armv7-a.patch | 0 .../patches}/valgrind-fix-build-armv7ve.patch | 0 .../vsftpd-disable-capabilities.patch | 0 .../patches}/vsftpd-fix-CVE-2015-1419.patch | 0 .../vsftpd/patches}/vsftpd-fixchroot.patch | 0 .../vsftpd-login-blank-password.patch | 0 .../patches}/change_DEFAULT_LOGFILE.patch | 0 .../set-check_cert-false-by-default.patch | 0 .../files}/wpa_supplicant.config | 0 ...-do-dynamic-linking-of-libtool-libra.patch | 0 ...-do-not-try-to-run-the-crc32selftest.patch | 0 .../xupnpd-add-configuration-files.diff | 0 .../xupnpd/patches}/xupnpd-dynamic-lua.patch | 0 .../xupnpd/patches}/xupnpd-fix-memleak.patch | 0 .../patches}/xupnpd-fix-webif-backlinks.diff | 0 ...ove-dependency-check-on-version-file.patch | 32 + .../zlib/patches}/zlib-ldflags-tests.patch | 0 .../patches}/zlib-remove.ldconfig.call.patch | 0 patches/Python-xcompile.patch | 264 -- patches/parted-device-mapper.patch | 69 - patches/parted-iconv.patch | 46 - patches/parted-sysmacros.patch | 32 - patches/valgrind12305-automake-1.11.2.patch | 30 - patches/valgrind12305-nevis-patch.diff | 456 ---- 412 files changed, 3679 insertions(+), 4685 deletions(-) rename {patches/alsa-lib => package/alsa-lib/patches}/0000-alsa_pc_in.patch (100%) rename {patches/alsa-lib => package/alsa-lib/patches}/0001-Don-t-use-fork-on-noMMU-platforms.patch (100%) rename patches/autofs/force-STRIP-to-emtpy.patch => package/autofs/patches/0000-force-STRIP-to-emtpy.patch (100%) rename {patches/base-passwd => package/base-passwd/patches}/0000-align-root.patch (100%) rename {patches/base-passwd => package/base-passwd/patches}/0005-disable-docs.patch (100%) rename {patches/bash => package/bash/patches}/bash50-001 (100%) rename {patches/bash => package/bash/patches}/bash50-002 (100%) rename {patches/bash => package/bash/patches}/bash50-003 (100%) rename {patches/bash => package/bash/patches}/bash50-004 (100%) rename {patches/bash => package/bash/patches}/bash50-005 (100%) rename {patches/bash => package/bash/patches}/bash50-006 (100%) rename {patches/bash => package/bash/patches}/bash50-007 (100%) rename {patches/bash => package/bash/patches}/bash50-008 (100%) rename {patches/bash => package/bash/patches}/bash50-009 (100%) rename {patches/bash => package/bash/patches}/bash50-010 (100%) rename {patches/bash => package/bash/patches}/bash50-011 (100%) rename {patches/bash => package/bash/patches}/bash50-012 (100%) rename {patches/bash => package/bash/patches}/bash50-013 (100%) rename {patches/bash => package/bash/patches}/bash50-014 (100%) rename {patches/bash => package/bash/patches}/bash50-015 (100%) rename {patches/bash => package/bash/patches}/bash50-016 (100%) rename {patches/bash => package/bash/patches}/bash50-017 (100%) rename {configs => package/busybox/files}/busybox-minimal.config (100%) rename {patches => package/busybox/patches}/busybox-fix-config-header.diff (100%) rename {patches => package/busybox/patches}/busybox-fix-partition-size.patch (100%) rename {patches => package/busybox/patches}/busybox-insmod-hack.patch (100%) rename {patches => package/busybox/patches}/busybox-mount_single_uuid.patch (100%) rename {patches => package/bzip2/patches}/bzip2.patch (100%) rename {patches => package/cairo/patches}/cairo-get_bitmap_surface.diff (100%) rename {patches => package/coreutils/patches}/coreutils-fix-build.patch (100%) rename {configs => package/crosstool-ng/files}/ct-ng-armbox.config (100%) rename {configs => package/crosstool-ng/files}/ct-ng-coolstream-hd1.config (100%) rename {configs => package/crosstool-ng/files}/ct-ng-coolstream-hd2.config (100%) rename {configs => package/crosstool-ng/files}/ct-ng-mipsbox.config (100%) rename {configs => package/crosstool-ng/files}/ct-ng-uClibc-1.0.24.config (100%) rename {patches => package/crosstool-ng/patches}/crosstool-ng-bash-version.patch (100%) rename {patches/crosstool-ng => package/crosstool-ng/patches}/gcc/999-gcc-6.3-backport-fix-of-check-for-empty-string-in-ubsan.c.patch (100%) rename {patches => package/djmount/patches}/djmount-fix-hang-with-asset-upnp.patch (100%) rename {patches => package/djmount/patches}/djmount-fix-incorrect-range-when-retrieving-content-via-HTTP.patch (100%) rename {patches => package/djmount/patches}/djmount-fix-new-autotools.diff (100%) rename {patches => package/djmount/patches}/djmount-fix-newer-gcc.patch (100%) rename {patches => package/djmount/patches}/djmount-fixed-crash-when-using-UTF-8-charset.patch (100%) rename {patches => package/djmount/patches}/djmount-fixed-crash.patch (100%) rename {patches => package/djmount/patches}/djmount-support-fstab-mounting.diff (100%) rename {patches => package/djmount/patches}/djmount-support-seeking-in-large-2gb-files.patch (100%) rename {patches/dosfstools => package/dosfstools/patches}/switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch (100%) rename {patches/dvb-apps => package/dvb-apps/patches}/0001-Fix-generate-keynames.patch (100%) rename {patches/dvb-apps => package/dvb-apps/patches}/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch (100%) rename {patches/dvb-apps => package/dvb-apps/patches}/0003-handle-static-shared-only-build.patch (100%) rename {patches/dvb-apps => package/dvb-apps/patches}/0004-Makefile-remove-test.patch (100%) rename {patches/dvb-apps => package/dvb-apps/patches}/0005-libucsi-optimization-removal.patch (100%) rename {patches/dvb-apps => package/dvb-apps/patches}/0006-CA_SET_PID.patch (100%) rename {patches => package/expat/patches}/expat-libtool-tag.patch (100%) rename {patches => package/ext4_utils/patches}/ext4_utils.mk (100%) rename {patches => package/fbshot/patches}/fbshot-32bit_cs_fb.diff (100%) rename {patches => package/fbshot/patches}/fbshot_cs_hd2.diff (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_02_fix_mpegts.patch (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_03_allow_to_choose_rtmp_impl_at_runtime.patch (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_04_hls_replace_key_uri.patch (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_06_optimize_aac.patch (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_07_increase_buffer_size.patch (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_08_recheck_discard_flags.patch (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_09_ffmpeg_fix_edit_list_parsing.patch (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_10_rtsp_patch (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_11_dxva2_patch (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_A02-corrupt-h264-frames.patch (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_A11-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch (100%) rename {patches/ffmpeg => package/ffmpeg/patches}/4_mips64_cpu_detection.patch (100%) rename {patches => package/freetype2/patches}/freetype2-config.patch (100%) rename {patches => package/freetype2/patches}/freetype2-pkgconf.patch (100%) rename {patches => package/freetype2/patches}/freetype2-subpixel.patch (100%) rename {patches => package/glib2/patches}/glib2-automake.patch (100%) rename {patches => package/glib2/patches}/glib2-disable-tests.patch (100%) rename {patches => package/gptfdisk/patches}/gptfdisk-ldlibs.patch (100%) rename {patches/graphlcd-base => package/graphlcd-base/patches}/0003-strip-graphlcd-conf.patch (100%) rename {patches/graphlcd-base => package/graphlcd-base/patches}/0004-material-colors.patch (100%) rename {patches/graphlcd-base => package/graphlcd-base/patches}/0005-add-vuplus-driver.patch (100%) rename {patches/graphlcd-base => package/graphlcd-base/patches}/graphlcd.patch (100%) rename {patches => package/harfbuzz/patches}/harfbuzz-disable-docs.patch (100%) rename {patches => package/hd6x-mali-drivers/patches}/hi3798mv200-support.patch (100%) rename {patches/hdparm => package/hdparm/patches}/0001-cflags.patch (100%) rename {patches => package/iperf/patches}/iperf-disable-profiling.patch (100%) rename {patches => package/kernel/files}/initramfs-subdirboot.cpio.gz (100%) rename configs/kernel-apollo.config => package/kernel/files/kernel-apollo.defconfig (100%) rename configs/kernel-hd5x.config => package/kernel/files/kernel-hd5x.defconfig (100%) rename configs/kernel-hd6x.config => package/kernel/files/kernel-hd6x.defconfig (100%) rename configs/kernel-kronos.config => package/kernel/files/kernel-kronos.defconfig (100%) rename configs/kernel-nevis.config => package/kernel/files/kernel-nevis.defconfig (100%) rename configs/kernel-vuduo.config => package/kernel/files/kernel-vuduo.defconfig (100%) rename configs/kernel-vuduo4k.config => package/kernel/files/kernel-vuduo4k.defconfig (100%) rename configs/kernel-vuduo4kse.config => package/kernel/files/kernel-vuduo4kse.defconfig (100%) rename configs/kernel-vusolo4k.config => package/kernel/files/kernel-vusolo4k.defconfig (100%) rename configs/kernel-vuultimo4k.config => package/kernel/files/kernel-vuultimo4k.defconfig (100%) rename configs/kernel-vuuno4k.config => package/kernel/files/kernel-vuuno4k.defconfig (100%) rename configs/kernel-vuuno4kse.config => package/kernel/files/kernel-vuuno4kse.defconfig (100%) rename configs/kernel-vuzero4k.config => package/kernel/files/kernel-vuzero4k.defconfig (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_0001-export_pmpoweroffprepare.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_0002-TBS-fixes-for-4.10-kernel.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_0003-Support-TBS-USB-drivers-for-4.6-kernel.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_0004-TBS-fixes-for-4.6-kernel.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_0005-STV-Add-PLS-support.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_0006-STV-Add-SNR-Signal-report-parameters.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_0007-blindscan2.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_0007-stv090x-optimized-TS-sync-control.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_add-more-devices-rtl8xxxu.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_bitsperlong.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_blacklist_mmc0.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_dvbs2x.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_reserve_dvb_adapter_0.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_10_t230c2.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_4_0001-remote.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_4_0002-log2-give-up-on-gcc-constant-optimizations.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_4_0003-dont-mark-register-as-const.patch (100%) rename {patches/kernel => package/kernel/patches}/gfutures/4_4_ieee80211-increase-scan-result-expire-time.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_0001-STV-Add-PLS-support.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_0001-STV-Add-SNR-Signal-report-parameters.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_0001-Support-TBS-USB-drivers.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_0001-stv090x-optimized-TS-sync-control.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_0001-tuners-tda18273-silicon-tuner-driver.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_0003-cxusb-Geniatech-T230-support.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_0004-log2-give-up-on-gcc-constant-optimizations.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_0005-uaccess-dont-mark-register-as-const.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_0006-makefile-disable-warnings.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_01-10-si2157-Silicon-Labs-Si2157-silicon-tuner-driver.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_02-10-si2168-Silicon-Labs-Si2168-DVB-T-T2-C-demod-driver.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_CONFIG_DVB_SP2.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_bcm_genet_disable_warn.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_bcmsysport_3.14.28-1.12.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_blindscan2.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_dmx_source_dvr.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_dvbs2x.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_dvbsky.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_fix_mmc_3.14.28-1.10.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_genksyms_fix_typeof_handling.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_kernel-add-support-for-gcc6.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_kernel-add-support-for-gcc7.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_kernel-add-support-for-gcc8.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_kernel-add-support-for-gcc9.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_linux_dvb-core.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_linux_dvb_adapter.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_linux_prevent_usb_dma_from_bmem.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_linux_rpmb_not_alloc.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_rtl2832u-2.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_rtl8712_fix_build_error.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_14_usb_core_hub_msleep.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_0001-STV-Add-PLS-support.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_0001-STV-Add-SNR-Signal-report-parameters.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_0001-Support-TBS-USB-drivers-3.9.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_0001-rt2800usb-add-support-for-rt55xx.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_0001-stv090x-optimized-TS-sync-control.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_01-10-si2157-Silicon-Labs-Si2157-silicon-tuner-driver.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_02-10-si2168-Silicon-Labs-Si2168-DVB-T-T2-C-demod-driver.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_CONFIG_DVB_SP2.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_add-dmx-source-timecode.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_af9015-output-full-range-SNR.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_af9033-output-full-range-SNR.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_as102-adjust-signal-strength-report.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_as102-scale-MER-to-full-range.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_blindscan2.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_cinergy_s2_usb_r2.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_cxd2820r-output-full-range-SNR.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_dvb-usb-dib0700-disable-sleep.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_dvb_usb_disable_rc_polling.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_dvbsky-t330.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_fix-dvb-siano-sms-order.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_fix_fuse_for_linux_mips_3-9.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_fixed_mtd.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_genksyms_fix_typeof_handling.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_it913x-switch-off-PID-filter-by-default.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_kernel-add-support-for-gcc5.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_kernel-add-support-for-gcc6.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_kernel-add-support-for-gcc7.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_kernel-add-support-for-gcc8.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_kernel-add-support-for-gcc9.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_linux-3.9-gcc-4.9.3-build-error-fixed.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_linux-sata_bcm.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_mxl5007t-add-no_probe-and-no_reset-parameters.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_nfs-max-rwsize-8k.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_rtl8187se-fix-warnings.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_rtl8712-fix-warnings.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_tda18271-advertise-supported-delsys.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/3_9_test.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0001-STV-Add-PLS-support.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0001-STV-Add-SNR-Signal-report-parameters.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0001-Support-TBS-USB-drivers-for-4.1-kernel.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0001-TBS-fixes-for-4.1-kernel.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0001-dvb-usb-fix-a867.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0001-regmap-add-regmap_write_bits.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0001-stv090x-optimized-TS-sync-control.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0002-af9035-fix-device-order-in-ID-list.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0002-log2-give-up-on-gcc-constant-optimizations.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0003-Add-support-for-dvb-usb-stick-Hauppauge-WinTV-soloHD.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0003-uaccess-dont-mark-register-as-const.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0004-af9035-add-USB-ID-07ca-0337-AVerMedia-HD-Volar-A867.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0005-Add-support-for-EVOLVEO-XtraTV-stick.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0006-dib8000-Add-support-for-Mygica-Geniatech-S2870.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0007-dib0700-add-USB-ID-for-another-STK8096-PVR-ref-desig.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0008-add-Hama-Hybrid-DVB-T-Stick-support.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0009-Add-Terratec-H7-Revision-4-to-DVBSky-driver.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0010-media-Added-support-for-the-TerraTec-T1-DVB-T-USB-tu.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0011-media-tda18250-support-for-new-silicon-tuner.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0012-media-dib0700-add-support-for-Xbox-One-Digital-TV-Tu.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0013-mn88472-Fix-possible-leak-in-mn88472_init.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0014-staging-media-Remove-unneeded-parentheses.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0015-staging-media-mn88472-simplify-NULL-tests.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0016-mn88472-fix-typo.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_0017-mn88472-finalize-driver.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_bcmgenet-recovery-fix.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_bcmsysport_4_1_45.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_blindscan2.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_dmx_source_dvr.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_kernel-add-support-for-gcc6.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_kernel-add-support-for-gcc7.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_kernel-add-support-for-gcc8.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_kernel-add-support-for-gcc9.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_linux_4_1_45_dvbs2x.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_linux_dvb-core.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_linux_dvb_adapter.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_linux_rpmb_not_alloc.patch (100%) rename {patches/kernel => package/kernel/patches}/vuplus/4_1_linux_usb_hub.patch (100%) rename {patches => package/libass/patches}/libass.patch (100%) rename {patches => package/libbluray/patches}/libbluray.patch (100%) rename {patches => package/libdpf/patches}/libdpf-crossbuild.patch (80%) rename {patches => package/libdvbsi/patches}/libdvbsi++-content_identifier_descriptor.patch (100%) rename {patches/libffi => package/libffi/patches}/0001-Fix-installation-location-of-libffi.patch (100%) rename {patches/libffi => package/libffi/patches}/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch (100%) rename {patches/libffi => package/libffi/patches}/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch (100%) rename {patches/libffi => package/libffi/patches}/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch (100%) rename {patches/libffi => package/libffi/patches}/0005-powerpc-fix-build-failure-on-power7-and-older.patch (100%) rename {patches/libffi => package/libffi/patches}/0006-Address-platforms-with-no-__int128.patch (100%) rename {patches/libffi => package/libffi/patches}/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch (100%) rename {patches => package/libid3tag/patches}/libid3tag-pc.patch (100%) rename {patches => package/libjpeg-turbo/patches}/libjpeg-turbo-tiff-ojpeg.patch (100%) rename {patches => package/libmad/patches}/libmad-frame_length.diff (100%) rename {patches => package/libmad/patches}/libmad-mips-h-constraint-removal.patch (100%) rename {patches => package/libmad/patches}/libmad-pc.patch (100%) rename {patches => package/libmad/patches}/libmad-remove-deprecated-cflags.patch (100%) rename {patches => package/libmad/patches}/libmad-thumb2-fixed-arm.patch (100%) rename {patches => package/libmad/patches}/libmad-thumb2-imdct-arm.patch (100%) rename {patches => package/libpng/patches}/libpng-Disable-pngfix-and-png-fix-itxt.patch (100%) rename {patches/libtirpc => package/libtirpc/patches}/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch (100%) rename {patches/libtirpc => package/libtirpc/patches}/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch (100%) rename {patches/libtirpc => package/libtirpc/patches}/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch (100%) rename {patches/libusb-compat => package/libusb-compat/patches}/0001-fix-a-build-issue-on-linux.patch (100%) rename {patches/libxml2 => package/libxml2/patches}/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch (100%) rename {patches/libxml2 => package/libxml2/patches}/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch (100%) rename {patches => package/links/patches}/links-ac-prog-cxx.patch (100%) rename {patches => package/links/patches}/links-accept_https_play.patch (100%) rename {patches => package/links/patches}/links-input-event1.patch (100%) rename {patches => package/links/patches}/links-input-event2.patch (100%) rename {patches => package/links/patches}/links-input-nevis_ir.patch (100%) rename {patches => package/links/patches}/links.patch (100%) rename {patches => package/lua-curl/patches}/lua-curl-Makefile.diff (100%) rename {patches => package/lua-feedparser/patches}/lua-feedparser.patch (100%) rename {patches => package/lua/patches}/lua-01-fix-LUA_ROOT.patch (100%) rename {patches => package/lua/patches}/lua-01-remove-readline.patch (100%) rename {patches => package/lua/patches}/lua-02-shared-libs-for-lua.patch (100%) rename {patches => package/lua/patches}/lua-03-lua-pc.patch (100%) rename {patches => package/lua/patches}/lua-04-crashfix.diff (100%) rename {patches => package/luaexpat/patches}/luaexpat-makefile.patch (100%) rename {patches => package/luaposix/patches}/luaposix-fix-docdir-build.patch (100%) rename {configs => package/luarocks/files}/luarocks-config.lua (100%) rename {patches => package/luarocks/patches}/luarocks-0001-allow-libluajit-detection.patch (100%) rename {patches/mc => package/mc/patches}/0001-mc-replace-perl-w-with-use-warnings.patch (100%) rename {patches/mc => package/mc/patches}/0002-nomandate.patch (100%) rename {patches/mc => package/mc/patches}/0003-subshell.patch (100%) rename {patches/mc => package/mc/patches}/0004-fix-mouse-handling-newer-terminfo.patch (100%) rename {patches/meson => package/meson/patches}/0001-Prefer-ext-static-libs-when-default-library-static.patch (100%) rename {patches/meson => package/meson/patches}/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch (100%) rename {patches => package/minicom/patches}/minicom-fix-h-v-return-value-is-not-0.patch (100%) rename {patches/minisatip => package/minisatip/patches}/0001-change-bootid-path.patch (100%) rename {patches => package/ncurses/patches}/ncurses-gcc-5.x-MKlib_gen.patch (100%) rename {patches => package/nfs-utils/patches}/nfs-utils_01-Patch-taken-from-Gentoo.patch (100%) rename {patches => package/nfs-utils/patches}/nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch (100%) rename {patches => package/nfs-utils/patches}/nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-libt.patch (100%) rename {patches => package/nfs-utils/patches}/nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch (100%) rename {patches/ninja => package/ninja/patches}/0001-set-minimum-cmake-version.patch (100%) rename {patches/ninja => package/ninja/patches}/0002-remove-fdiagnostics-color-from-make-command.patch (100%) rename {patches/ninja => package/ninja/patches}/0003-CMake-fix-object-library-usage.patch (100%) rename {patches/ntfs-3g => package/ntfs-3g/patches}/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch (100%) rename {patches/ntp => package/ntp/patches}/0001-mkver_in.patch (100%) rename {patches/openssl => package/openssl/patches}/0000-Configure-align-O-flag.patch (100%) rename {patches => package/pixman/patches}/pixman-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch (100%) rename {patches => package/pixman/patches}/pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch (100%) rename {patches => package/pixman/patches}/pixman-asm_include.patch (100%) rename {patches/pkgconf => package/pkgconf/patches}/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch (100%) rename {patches => package/procps-ng/patches}/procps-ng-no-tests-docs.patch (100%) rename {patches => package/pugixml/patches}/pugixml-config.patch (100%) rename {patches/python3-setuptools => package/python3-setuptools/patches}/0001-add-executable.patch (100%) rename {patches/python3-setuptools => package/python3-setuptools/patches}/0002-change-shebang-to-python3.patch (100%) rename {patches/python3 => package/python3/patches}/0001-Make-the-build-of-pyc-files-conditional.patch (100%) rename {patches/python3 => package/python3/patches}/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch (100%) rename {patches/python3 => package/python3/patches}/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch (100%) rename {patches/python3 => package/python3/patches}/0004-Adjust-library-header-paths-for-cross-compilation.patch (100%) rename {patches/python3 => package/python3/patches}/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch (100%) rename {patches/python3 => package/python3/patches}/0006-Don-t-add-multiarch-paths.patch (100%) rename {patches/python3 => package/python3/patches}/0007-Abort-on-failed-module-build.patch (100%) rename {patches/python3 => package/python3/patches}/0008-Serial-ioctl-workaround.patch (100%) rename {patches/python3 => package/python3/patches}/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch (100%) rename {patches/python3 => package/python3/patches}/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch (100%) rename {patches/python3 => package/python3/patches}/0011-Override-system-locale-and-set-to-default-when-addin.patch (100%) rename {patches/python3 => package/python3/patches}/0012-Add-importlib-fix-for-PEP-3147-issue.patch (100%) rename {patches/python3 => package/python3/patches}/0013-Add-an-option-to-disable-installation-of-test-module.patch (100%) rename {patches/python3 => package/python3/patches}/0014-Add-an-option-to-disable-pydoc.patch (100%) rename {patches/python3 => package/python3/patches}/0015-Add-an-option-to-disable-lib2to3.patch (100%) rename {patches/python3 => package/python3/patches}/0016-Add-option-to-disable-the-sqlite3-module.patch (100%) rename {patches/python3 => package/python3/patches}/0017-Add-an-option-to-disable-the-tk-module.patch (100%) rename {patches/python3 => package/python3/patches}/0018-Add-an-option-to-disable-the-curses-module.patch (100%) rename {patches/python3 => package/python3/patches}/0019-Add-an-option-to-disable-expat.patch (100%) rename {patches/python3 => package/python3/patches}/0020-Add-an-option-to-disable-CJK-codecs.patch (100%) rename {patches/python3 => package/python3/patches}/0021-Add-an-option-to-disable-NIS.patch (100%) rename {patches/python3 => package/python3/patches}/0022-Add-an-option-to-disable-unicodedata.patch (100%) rename {patches/python3 => package/python3/patches}/0023-Add-an-option-to-disable-IDLE.patch (100%) rename {patches/python3 => package/python3/patches}/0024-Add-an-option-to-disable-decimal.patch (100%) rename {patches/python3 => package/python3/patches}/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch (100%) rename {patches/python3 => package/python3/patches}/0026-Add-an-option-to-disable-openssl-support.patch (100%) rename {patches/python3 => package/python3/patches}/0027-Add-an-option-to-disable-the-readline-module.patch (100%) rename {patches/python3 => package/python3/patches}/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch (100%) rename {patches/python3 => package/python3/patches}/0029-python-config.sh-don-t-reassign-prefix.patch (100%) rename {patches/python3 => package/python3/patches}/0030-Fix-cross-compiling-the-uuid-module.patch (100%) rename {patches/python3 => package/python3/patches}/0031-Add-an-option-to-disable-uuid-module.patch (100%) rename {patches/python3 => package/python3/patches}/0032-fix-building-on-older-distributions.patch (100%) rename {patches/python3 => package/python3/patches}/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch (100%) rename {patches/python3 => package/python3/patches}/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch (100%) rename {patches => package/rpcbind/patches}/rpcbind-0001-Remove-yellow-pages-support.patch (100%) rename {patches => package/rpcbind/patches}/rpcbind-0002-add_option_to_fix_port_number.patch (100%) rename {patches/rtl8812au => package/rtl8812au/patches}/0001-rt8812au-gcc5.patch (100%) rename {patches/rtl8812au => package/rtl8812au/patches}/0002-rt8812au-Add-support-for-kernels-4.8.patch (100%) rename {patches/rtl8822bu => package/rtl8822bu/patches}/0001-add-linux-4.19-support.patch (100%) rename {patches/rtl8822bu => package/rtl8822bu/patches}/0002-add-linux-4.20-support.patch (100%) rename {patches/rtl8822bu => package/rtl8822bu/patches}/0003-add-linux-5.0-support.patch (100%) rename {patches/rtl8822bu => package/rtl8822bu/patches}/0004-add-linux-5.1-support.patch (100%) rename {patches/rtl8822bu => package/rtl8822bu/patches}/0005-add-linux-5.2-support.patch (100%) rename {configs => package/samba33/files}/samba33-config.site (100%) rename {patches => package/samba33/patches}/samba33-build-only-what-we-need.patch (100%) rename {patches => package/samba33/patches}/samba33-configure.in-make-getgrouplist_ok-test-cross-compile.patch (100%) rename {configs => package/samba36/files}/samba36-config.site (100%) rename {patches => package/samba36/patches}/samba36-CVE-2016-2112-v3-6.patch (91%) rename {patches => package/samba36/patches}/samba36-CVE-2016-2115-v3-6.patch (94%) rename {patches => package/samba36/patches}/samba36-CVE-2017-7494-v3-6.patch (91%) rename {patches => package/samba36/patches}/samba36-build-only-what-we-need.patch (100%) rename {patches => package/samba36/patches}/samba36-remove_ad_support.patch (100%) rename {patches => package/samba36/patches}/samba36-remove_printer_support.patch (100%) rename {patches => package/samba36/patches}/samba36-remove_registry_backend.patch (100%) rename {patches => package/samba36/patches}/samba36-remove_services.patch (100%) rename {patches => package/samba36/patches}/samba36-remove_winreg_support.patch (100%) rename {patches => package/samba36/patches}/samba36-strip_srvsvc.patch (100%) rename {patches/sysvinit => package/sysvinit/patches}/change-INIT_FIFO.patch (100%) rename {patches/sysvinit => package/sysvinit/patches}/crypt-lib.patch (100%) rename {patches => package/usbutils/patches}/usbutils-avoid-dependency-on-bash.patch (100%) rename {patches => package/usbutils/patches}/usbutils-fix-null-pointer-crash.patch (100%) rename {patches => package/ushare/patches}/ushare-disable-iconv-check.patch (100%) rename {patches => package/ushare/patches}/ushare-fix-building-with-gcc-5.x.patch (100%) rename {patches => package/ushare/patches}/ushare.diff (100%) rename {patches => package/valgrind/patches}/valgrind-fix-build-armv7-a.patch (100%) rename {patches => package/valgrind/patches}/valgrind-fix-build-armv7ve.patch (100%) rename {patches => package/vsftpd/patches}/vsftpd-disable-capabilities.patch (100%) rename {patches => package/vsftpd/patches}/vsftpd-fix-CVE-2015-1419.patch (100%) rename {patches => package/vsftpd/patches}/vsftpd-fixchroot.patch (100%) rename {patches => package/vsftpd/patches}/vsftpd-login-blank-password.patch (100%) rename {patches/wget => package/wget/patches}/change_DEFAULT_LOGFILE.patch (100%) rename {patches/wget => package/wget/patches}/set-check_cert-false-by-default.patch (100%) rename {configs => package/wpa_supplicant/files}/wpa_supplicant.config (100%) rename {patches/xfsprogs => package/xfsprogs/patches}/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch (100%) rename {patches/xfsprogs => package/xfsprogs/patches}/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch (100%) rename {patches => package/xupnpd/patches}/xupnpd-add-configuration-files.diff (100%) rename {patches => package/xupnpd/patches}/xupnpd-dynamic-lua.patch (100%) rename {patches => package/xupnpd/patches}/xupnpd-fix-memleak.patch (100%) rename {patches => package/xupnpd/patches}/xupnpd-fix-webif-backlinks.diff (100%) create mode 100644 package/zic/patches/0001-remove-dependency-check-on-version-file.patch rename {patches => package/zlib/patches}/zlib-ldflags-tests.patch (100%) rename {patches => package/zlib/patches}/zlib-remove.ldconfig.call.patch (100%) delete mode 100644 patches/Python-xcompile.patch delete mode 100644 patches/parted-device-mapper.patch delete mode 100644 patches/parted-iconv.patch delete mode 100644 patches/parted-sysmacros.patch delete mode 100644 patches/valgrind12305-automake-1.11.2.patch delete mode 100644 patches/valgrind12305-nevis-patch.diff diff --git a/Makefile b/Makefile index 1b5afa97..4f7f506e 100755 --- a/Makefile +++ b/Makefile @@ -135,7 +135,7 @@ help: @echo " * make image - Builds our beautiful NI-Image" @echo "" @echo "Later, you might find those useful:" - @echo " * make update-all - Update buildsystem and all sources" + @echo " * make update - Update buildsystem and all sources" @echo "" @echo "Cleanup:" @echo " * make clean - Clean up from previous build an prepare for a new one" diff --git a/config.example b/config.example index 51f20e2b..4428b971 100644 --- a/config.example +++ b/config.example @@ -51,7 +51,7 @@ MAINTAINER = $(shell whoami) # ----------------------------------------------------------------------------- # use lastest VU+ drivers -#VUPLUS-DRIVERS_LATEST = yes +#VUPLUS_DRIVERS_LATEST = yes # ----------------------------------------------------------------------------- diff --git a/make/buildsystem-bootstrap.mk b/make/buildsystem-bootstrap.mk index ed3140cf..36344e12 100644 --- a/make/buildsystem-bootstrap.mk +++ b/make/buildsystem-bootstrap.mk @@ -33,7 +33,7 @@ bootstrap: $(BOOTSTRAP) # ----------------------------------------------------------------------------- skeleton: | $(TARGET_DIR) - $(INSTALL_COPY) --remove-destination $(SKEL-ROOT)/. $(TARGET_DIR)/ + $(INSTALL_COPY) --remove-destination $(SKEL_ROOT)/. $(TARGET_DIR)/ $(SED) 's|%(BOOT_PARTITION)|$(BOOT_PARTITION)|' $(TARGET_sysconfdir)/mdev.conf # ----------------------------------------------------------------------------- @@ -115,17 +115,17 @@ var-update: $(TARGET_localstatedir)/update $(TARGET_localstatedir)/update: | $(TARGET_DIR) mkdir -p $(@) ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1)) - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/zImage $(@) + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/zImage $(@) else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2)) - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/vmlinux.ub.gz $(@) - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/uldr.bin $(@) + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/vmlinux.ub.gz $(@) + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/uldr.bin $(@) ifeq ($(BOXMODEL),kronos_v2) - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/u-boot.bin.kronos_v2 $(@)/u-boot.bin + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/u-boot.bin.kronos_v2 $(@)/u-boot.bin else - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/u-boot.bin $(@) + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/u-boot.bin $(@) endif endif - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/stb_update.data $(@) + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/stb_update.data $(@) endif diff --git a/make/buildsystem-helpers.mk b/make/buildsystem-helpers.mk index 8629a29f..cfaf4a47 100644 --- a/make/buildsystem-helpers.mk +++ b/make/buildsystem-helpers.mk @@ -3,6 +3,43 @@ # # ----------------------------------------------------------------------------- +# download archives into download directory +DOWNLOAD = wget --no-check-certificate -t3 -T60 -c -P $(DL_DIR) + +# unpack archives into build directory +UNTAR = tar -C $(BUILD_DIR) -xf $(DL_DIR) +UNZIP = unzip -d $(BUILD_DIR) -o $(DL_DIR) + +# clean up +REMOVE = rm -rf $(BUILD_DIR) + +# build helper variables +CD = set -e; cd +CHDIR = $(CD) $(BUILD_DIR) +MKDIR = mkdir -p $(BUILD_DIR) +CPDIR = cp -a -t $(BUILD_DIR) $(DL_DIR) +#TOUCH = @touch $(DEPS_DIR)/$(@) +TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@) +SED = $(shell which sed || type -p sed) -i -e + +INSTALL = install +INSTALL_DATA = $(INSTALL) -m 0644 +INSTALL_EXEC = $(INSTALL) -m 0755 +INSTALL_COPY = cp -a + +define INSTALL_EXIST # (source, dest) + if [ -d $(dir $(1)) ]; then \ + $(INSTALL) -d $(2); \ + $(INSTALL_COPY) $(1) $(2); \ + fi +endef + +GET-GIT-ARCHIVE = $(HELPERS_DIR)/get-git-archive.sh +GET-GIT-SOURCE = $(HELPERS_DIR)/get-git-source.sh +GET-SVN-SOURCE = $(HELPERS_DIR)/get-svn-source.sh +UPDATE-RC.D = $(HELPERS_DIR)/update-rc.d -r $(TARGET_DIR) + +# ----------------------------------------------------------------------------- # execute local scripts define local-script @if [ -x $(LOCAL_DIR)/scripts/$(1) ]; then \ @@ -16,22 +53,22 @@ endef define apply_patches l=$(strip $(2)); test -z $$l && l=1; \ for i in $(1); do \ - if [ -e $$i -o -e $(PATCHES)/$$i ]; then \ + if [ -e $$i -o -e $(PKG_PATCHES_DIR)/$$i ]; then \ if [ -d $$i ]; then \ for p in $$i/*; do \ - echo -e "$(TERM_YELLOW)Applying $${p#$(PATCHES)/}$(TERM_NORMAL)"; \ + echo -e "$(TERM_YELLOW)Applying $${p#$(PKG_PATCHES_DIR)/}$(TERM_NORMAL)"; \ if [ $${p:0:1} == "/" ]; then \ patch -p$$l -i $$p; \ else \ - patch -p$$l -i $(PATCHES)/$$p; \ + patch -p$$l -i $(PKG_PATCHES_DIR)/$$p; \ fi; \ done; \ else \ - echo -e "$(TERM_YELLOW)Applying $${i#$(PATCHES)/}$(TERM_NORMAL)"; \ + echo -e "$(TERM_YELLOW)Applying $${i#$(PKG_PATCHES_DIR)/}$(TERM_NORMAL)"; \ if [ $${i:0:1} == "/" ]; then \ patch -p$$l -i $$i; \ else \ - patch -p$$l -i $(PATCHES)/$$i; \ + patch -p$$l -i $(PKG_PATCHES_DIR)/$$i; \ fi; \ fi; \ fi; \ @@ -54,10 +91,10 @@ REWRITE_LIBTOOL_RULES = "s,^libdir=.*,libdir='$(1)',; \ REWRITE_LIBTOOL_TAG = rewritten=1 -define REWRITE_LIBTOOL # (libdir) +define rewrite_libtool # (libdir) for la in $$(find $(1) -name "*.la" -type f); do \ if ! grep -q "$(REWRITE_LIBTOOL_TAG)" $${la}; then \ - echo -e "$(TERM_YELLOW)Rewriting $${la#$(TARGET_DIR)/}$(TERM_NORMAL)"; \ + $(call MESSAGE,"Rewriting $${la#$(TARGET_DIR)/}"); \ $(SED) $(REWRITE_LIBTOOL_RULES) $${la}; \ echo -e "\n# Adapted to buildsystem\n$(REWRITE_LIBTOOL_TAG)" >> $${la}; \ fi; \ @@ -65,8 +102,8 @@ define REWRITE_LIBTOOL # (libdir) endef # rewrite libtool libraries automatically -REWRITE_LIBTOOL_LA = $(call REWRITE_LIBTOOL,$(TARGET_base_libdir)); \ - $(call REWRITE_LIBTOOL,$(TARGET_libdir)) +REWRITE_LIBTOOL = $(foreach libdir,$(TARGET_base_libdir) $(TARGET_libdir),\ + $(call rewrite_libtool,$(libdir))$(sep)) # ----------------------------------------------------------------------------- @@ -102,120 +139,6 @@ endef # ----------------------------------------------------------------------------- -# -# $(1) = title -# $(2) = color -# 0 - Black -# 1 - Red -# 2 - Green -# 3 - Yellow -# 4 - Blue -# 5 - Magenta -# 6 - Cyan -# 7 - White -# $(3) = left|center|right -# -define draw_line - @ \ - printf '%.0s-' {1..$(shell tput cols)}; \ - if test "$(1)"; then \ - cols=$(shell tput cols); \ - length=$(shell echo $(1) | awk '{print length}'); \ - case "$(3)" in \ - *right) let indent="length + 1" ;; \ - *center) let indent="cols - (cols - length) / 2" ;; \ - *left|*) let indent="cols" ;; \ - esac; \ - tput cub $$indent; \ - test "$(2)" && printf $$(tput setaf $(2)); \ - printf '$(1)'; \ - test "$(2)" && printf $$(tput sgr0); \ - fi; \ - echo -endef - -# ----------------------------------------------------------------------------- - -archives-list: - @rm -f $(BUILD_DIR)/$(@) - @make -qp | grep --only-matching '^\$(DL_DIR).*:' | sed "s|:||g" > $(BUILD_DIR)/$(@) - -DOCLEANUP ?= no -GETMISSING ?= no -archives-info: archives-list - @echo "[ ** ] Unused targets in make/archives.mk" - @grep --only-matching '^\$$(DL_DIR).*:' make/archives.mk | sed "s|:||g" | \ - while read target; do \ - found=false; \ - for makefile in make/*.mk; do \ - if [ "$${makefile##*/}" = "archives.mk" ]; then \ - continue; \ - fi; \ - if [ "$${makefile: -9}" = "-extra.mk" ]; then \ - continue; \ - fi; \ - if grep -q "$$target" $$makefile; then \ - found=true; \ - fi; \ - if [ "$$found" = "true" ]; then \ - continue; \ - fi; \ - done; \ - if [ "$$found" = "false" ]; then \ - echo -e "[$(TERM_RED) !! $(TERM_NORMAL)] $$target"; \ - fi; \ - done; - @echo "[ ** ] Unused archives" - @find $(DL_DIR)/ -maxdepth 1 -type f | \ - while read archive; do \ - if ! grep -q $$archive $(BUILD_DIR)/archives-list; then \ - echo -e "[$(TERM_YELLOW) rm $(TERM_NORMAL)] $$archive"; \ - if [ "$(DOCLEANUP)" = "yes" ]; then \ - rm $$archive; \ - fi; \ - fi; \ - done; - @echo "[ ** ] Missing archives" - @cat $(BUILD_DIR)/archives-list | \ - while read archive; do \ - if [ -e $$archive ]; then \ - #echo -e "[$(TERM_GREEN) ok $(TERM_NORMAL)] $$archive"; \ - true; \ - else \ - echo -e "[$(TERM_YELLOW) -- $(TERM_NORMAL)] $$archive"; \ - if [ "$(GETMISSING)" = "yes" ]; then \ - make $$archive; \ - fi; \ - fi; \ - done; - @$(REMOVE)/archives-list - -# ----------------------------------------------------------------------------- - -# FIXME - how to resolve variables while grepping makefiles? -patches-info: - @echo "[ ** ] Unused patches" - @for patch in $(PATCHES)/*; do \ - if [ ! -f $$patch ]; then \ - continue; \ - fi; \ - patch=$${patch##*/}; \ - found=false; \ - for makefile in make/*.mk; do \ - if grep -q "$$patch" $$makefile; then \ - found=true; \ - fi; \ - if [ "$$found" = "true" ]; then \ - continue; \ - fi; \ - done; \ - if [ "$$found" = "false" ]; then \ - echo -e "[$(TERM_RED) !! $(TERM_NORMAL)] $$patch"; \ - fi; \ - done; - -# ----------------------------------------------------------------------------- - # Create reversed changelog using git log --reverse. # Remove duplicated commits and re-reverse the changelog using awk. # This keeps the original commit and removes all picked duplicates. @@ -227,14 +150,11 @@ endef changelogs: $(call make-changelog) > $(STAGING_DIR)/changelog-buildsystem - $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \ + $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \ $(call make-changelog) > $(STAGING_DIR)/changelog-neutrino - $(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); \ + $(CD) $(SOURCE_DIR)/$(NI_LIBSTB_HAL); \ $(call make-changelog) > $(STAGING_DIR)/changelog-libstb-hal # ----------------------------------------------------------------------------- -PHONY += archives-list -PHONY += archives-info -PHONY += patches-info PHONY += changelogs diff --git a/make/buildsystem-prerequisites.mk b/make/buildsystem-prerequisites.mk index 176847eb..36abd1b8 100644 --- a/make/buildsystem-prerequisites.mk +++ b/make/buildsystem-prerequisites.mk @@ -70,12 +70,12 @@ download: $(SOURCE_DIR): mkdir -p $(@) -$(BUILD-GENERIC-PC): - git clone $(NI-PUBLIC)/$(NI-BUILD-GENERIC-PC).git $(BUILD-GENERIC-PC) +$(BUILD_GENERIC_PC): + git clone $(NI_PUBLIC)/$(NI_BUILD_GENERIC_PC).git $(BUILD_GENERIC_PC) -$(SOURCE_DIR)/$(NI-NEUTRINO): +$(SOURCE_DIR)/$(NI_NEUTRINO): $(CD) $(SOURCE_DIR); \ - git clone $(NI-PUBLIC)/$(@F).git + git clone $(NI_PUBLIC)/$(@F).git ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add tuxbox $(GITHUB)/tuxbox-neutrino/gui-neutrino.git; \ @@ -85,9 +85,9 @@ ifeq ($(NI_ADMIN),true) git fetch --all endif -$(SOURCE_DIR)/$(NI-LIBSTB-HAL): +$(SOURCE_DIR)/$(NI_LIBSTB_HAL): $(CD) $(SOURCE_DIR); \ - git clone $(NI-PUBLIC)/$(@F).git + git clone $(NI_PUBLIC)/$(@F).git ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add tuxbox $(GITHUB)/tuxbox-neutrino/library-stb-hal.git; \ @@ -100,13 +100,13 @@ endif $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM): ifeq ($(HAS_LIBCS),yes) $(CD) $(SOURCE_DIR); \ - git clone $(NI-PRIVATE)/$(@F).git + git clone $(NI_PRIVATE)/$(@F).git endif # upstream for rebase -$(SOURCE_DIR)/$(NI-FFMPEG): +$(SOURCE_DIR)/$(NI_FFMPEG): $(CD) $(SOURCE_DIR); \ - git clone $(NI-PUBLIC)/$(@F).git + git clone $(NI_PUBLIC)/$(@F).git ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add upstream https://git.ffmpeg.org/ffmpeg.git; \ @@ -115,9 +115,9 @@ endif # upstream for rebase # torvalds for cherry-picking -$(SOURCE_DIR)/$(NI-LINUX-KERNEL): +$(SOURCE_DIR)/$(NI_LINUX_KERNEL): $(CD) $(SOURCE_DIR); \ - git clone $(NI-PUBLIC)/$(@F).git + git clone $(NI_PUBLIC)/$(@F).git ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add upstream https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; \ @@ -126,9 +126,9 @@ ifeq ($(NI_ADMIN),true) endif # upstream for rebase -$(SOURCE_DIR)/$(NI-OFGWRITE): +$(SOURCE_DIR)/$(NI_OFGWRITE): $(CD) $(SOURCE_DIR); \ - git clone $(NI-PUBLIC)/$(@F).git + git clone $(NI_PUBLIC)/$(@F).git ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add upstream $(GITHUB)/oe-alliance/ofgwrite.git; \ @@ -136,42 +136,42 @@ ifeq ($(NI_ADMIN),true) endif # upstream for rebase -$(SOURCE_DIR)/$(NI-RTMPDUMP): +$(SOURCE_DIR)/$(NI_RTMPDUMP): $(CD) $(SOURCE_DIR); \ - git clone $(NI-PUBLIC)/$(@F).git + git clone $(NI_PUBLIC)/$(@F).git ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add upstream git://git.ffmpeg.org/rtmpdump; \ git fetch --all endif -$(SOURCE_DIR)/$(NI-DRIVERS-BIN) \ -$(SOURCE_DIR)/$(NI-LOGO-STUFF) \ -$(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS) \ -$(SOURCE_DIR)/$(NI-OPENTHREADS) \ -$(SOURCE_DIR)/$(NI-STREAMRIPPER): +$(SOURCE_DIR)/$(NI_DRIVERS_BIN) \ +$(SOURCE_DIR)/$(NI_LOGO_STUFF) \ +$(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS) \ +$(SOURCE_DIR)/$(NI_OPENTHREADS) \ +$(SOURCE_DIR)/$(NI_STREAMRIPPER): $(CD) $(SOURCE_DIR); \ - git clone $(NI-PUBLIC)/$(@F).git + git clone $(NI_PUBLIC)/$(@F).git ni-sources: $(SOURCE_DIR) \ - $(BUILD-GENERIC-PC) \ - $(SOURCE_DIR)/$(NI-DRIVERS-BIN) \ - $(SOURCE_DIR)/$(NI-FFMPEG) \ + $(BUILD_GENERIC_PC) \ + $(SOURCE_DIR)/$(NI_DRIVERS_BIN) \ + $(SOURCE_DIR)/$(NI_FFMPEG) \ $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM) \ - $(SOURCE_DIR)/$(NI-LIBSTB-HAL) \ - $(SOURCE_DIR)/$(NI-LINUX-KERNEL) \ - $(SOURCE_DIR)/$(NI-LOGO-STUFF) \ - $(SOURCE_DIR)/$(NI-NEUTRINO) \ - $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS) \ - $(SOURCE_DIR)/$(NI-OFGWRITE) \ - $(SOURCE_DIR)/$(NI-OPENTHREADS) \ - $(SOURCE_DIR)/$(NI-RTMPDUMP) \ - $(SOURCE_DIR)/$(NI-STREAMRIPPER) + $(SOURCE_DIR)/$(NI_LIBSTB_HAL) \ + $(SOURCE_DIR)/$(NI_LINUX_KERNEL) \ + $(SOURCE_DIR)/$(NI_LOGO_STUFF) \ + $(SOURCE_DIR)/$(NI_NEUTRINO) \ + $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS) \ + $(SOURCE_DIR)/$(NI_OFGWRITE) \ + $(SOURCE_DIR)/$(NI_OPENTHREADS) \ + $(SOURCE_DIR)/$(NI_RTMPDUMP) \ + $(SOURCE_DIR)/$(NI_STREAMRIPPER) checkout-branches: - $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git checkout $(FFMPEG_BRANCH) - $(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); git checkout $(KERNEL_BRANCH) - $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); git checkout $(NEUTRINO_BRANCH) + $(CD) $(SOURCE_DIR)/$(NI_FFMPEG); git checkout $(FFMPEG_BRANCH) + $(CD) $(SOURCE_DIR)/$(NI_LINUX_KERNEL); git checkout $(KERNEL_BRANCH) + $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); git checkout $(NEUTRINO_BRANCH) # ----------------------------------------------------------------------------- diff --git a/make/buildsystem-update.mk b/make/buildsystem-update.mk index b04f2763..9ecd875b 100644 --- a/make/buildsystem-update.mk +++ b/make/buildsystem-update.mk @@ -12,24 +12,24 @@ endif update-neutrino: export GIT_MERGE_AUTOEDIT=no; \ - $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \ + $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \ git checkout master; \ git pull --all update-remotes: ifeq ($(NI_ADMIN),true) export GIT_MERGE_AUTOEDIT=no; \ - $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \ + $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \ git checkout master; \ git fetch --all - $(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); \ + $(CD) $(SOURCE_DIR)/$(NI_LIBSTB_HAL); \ git checkout master; \ git fetch --all - $(CD) $(SOURCE_DIR)/$(NI-OFGWRITE); \ + $(CD) $(SOURCE_DIR)/$(NI_OFGWRITE); \ git checkout master; \ git fetch --all; \ git pull upstream master - $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS); \ + $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS); \ git checkout master; \ git fetch --all; \ ./update-tuxbox-remotes.sh @@ -38,26 +38,26 @@ endif # rebase of ffmpeg/kernel repos forces us to force push into git repo # use this target once if such force push was done update-ni-force: - #rm -rf $(SOURCE_DIR)/$(NI-LINUX-KERNEL) - rm -rf $(SOURCE_DIR)/$(NI-FFMPEG) + #rm -rf $(SOURCE_DIR)/$(NI_LINUX_KERNEL) + rm -rf $(SOURCE_DIR)/$(NI_FFMPEG) make ni-sources make update-ni-sources update-ni-sources: ni-sources update-neutrino - $(CD) $(BUILD-GENERIC-PC); git pull - $(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN); git pull - $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git pull --all + $(CD) $(BUILD_GENERIC_PC); git pull + $(CD) $(SOURCE_DIR)/$(NI_DRIVERS_BIN); git pull + $(CD) $(SOURCE_DIR)/$(NI_FFMPEG); git pull --all ifeq ($(HAS_LIBCS),yes) $(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git pull endif - $(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); git pull - $(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); git pull --all - $(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF); git pull - $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS); git pull - $(CD) $(SOURCE_DIR)/$(NI-OFGWRITE); git pull - $(CD) $(SOURCE_DIR)/$(NI-OPENTHREADS); git pull - $(CD) $(SOURCE_DIR)/$(NI-RTMPDUMP); git pull - $(CD) $(SOURCE_DIR)/$(NI-STREAMRIPPER); git pull + $(CD) $(SOURCE_DIR)/$(NI_LIBSTB_HAL); git pull + $(CD) $(SOURCE_DIR)/$(NI_LINUX_KERNEL); git pull --all + $(CD) $(SOURCE_DIR)/$(NI_LOGO_STUFF); git pull + $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS); git pull + $(CD) $(SOURCE_DIR)/$(NI_OFGWRITE); git pull + $(CD) $(SOURCE_DIR)/$(NI_OPENTHREADS); git pull + $(CD) $(SOURCE_DIR)/$(NI_RTMPDUMP); git pull + $(CD) $(SOURCE_DIR)/$(NI_STREAMRIPPER); git pull make checkout-branches update: update-self update-ni-sources @@ -70,59 +70,59 @@ push: ifeq ($(HAS_INTERNALS),yes) $(CD) $(BASE_DIR)/$(NI-INTERNALS); git push endif - $(CD) $(BUILD-GENERIC-PC); git push - $(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN); git push - $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git push --all + $(CD) $(BUILD_GENERIC_PC); git push + $(CD) $(SOURCE_DIR)/$(NI_DRIVERS_BIN); git push + $(CD) $(SOURCE_DIR)/$(NI_FFMPEG); git push --all ifeq ($(HAS_LIBCS),yes) $(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git push --all endif - $(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); git push - $(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); git push --all - $(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF); git push - $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); git push - $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS); git push - $(CD) $(SOURCE_DIR)/$(NI-OFGWRITE); git push - $(CD) $(SOURCE_DIR)/$(NI-OPENTHREADS); git push - $(CD) $(SOURCE_DIR)/$(NI-RTMPDUMP); git push - $(CD) $(SOURCE_DIR)/$(NI-STREAMRIPPER); git push + $(CD) $(SOURCE_DIR)/$(NI_LIBSTB_HAL); git push + $(CD) $(SOURCE_DIR)/$(NI_LINUX_KERNEL); git push --all + $(CD) $(SOURCE_DIR)/$(NI_LOGO_STUFF); git push + $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); git push + $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS); git push + $(CD) $(SOURCE_DIR)/$(NI_OFGWRITE); git push + $(CD) $(SOURCE_DIR)/$(NI_OPENTHREADS); git push + $(CD) $(SOURCE_DIR)/$(NI_RTMPDUMP); git push + $(CD) $(SOURCE_DIR)/$(NI_STREAMRIPPER); git push status: git status -s -b ifeq ($(HAS_INTERNALS),yes) $(CD) $(BASE_DIR)/$(NI-INTERNALS); git status -s -b endif - $(CD) $(BUILD-GENERIC-PC); git status -s -b - $(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN); git status -s -b - $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git status -s -b + $(CD) $(BUILD_GENERIC_PC); git status -s -b + $(CD) $(SOURCE_DIR)/$(NI_DRIVERS_BIN); git status -s -b + $(CD) $(SOURCE_DIR)/$(NI_FFMPEG); git status -s -b ifeq ($(HAS_LIBCS),yes) $(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git status -s -b endif - $(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); git status -s -b - $(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); git status -s -b - $(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF); git status -s -b - $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); git status -s -b - $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS); git status -s -b - $(CD) $(SOURCE_DIR)/$(NI-OFGWRITE); git status -s -b - $(CD) $(SOURCE_DIR)/$(NI-OPENTHREADS); git status -s -b - $(CD) $(SOURCE_DIR)/$(NI-RTMPDUMP); git status -s -b - $(CD) $(SOURCE_DIR)/$(NI-STREAMRIPPER); git status -s -b + $(CD) $(SOURCE_DIR)/$(NI_LIBSTB_HAL); git status -s -b + $(CD) $(SOURCE_DIR)/$(NI_LINUX_KERNEL); git status -s -b + $(CD) $(SOURCE_DIR)/$(NI_LOGO_STUFF); git status -s -b + $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); git status -s -b + $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS); git status -s -b + $(CD) $(SOURCE_DIR)/$(NI_OFGWRITE); git status -s -b + $(CD) $(SOURCE_DIR)/$(NI_OPENTHREADS); git status -s -b + $(CD) $(SOURCE_DIR)/$(NI_RTMPDUMP); git status -s -b + $(CD) $(SOURCE_DIR)/$(NI_STREAMRIPPER); git status -s -b # ----------------------------------------------------------------------------- REPOSITORIES = \ . \ - $(BUILD-GENERIC-PC) \ - $(SOURCE_DIR)/$(NI-DRIVERS-BIN) \ - $(SOURCE_DIR)/$(NI-FFMPEG) \ - $(SOURCE_DIR)/$(NI-LIBSTB-HAL) \ - $(SOURCE_DIR)/$(NI-LINUX-KERNEL) \ - $(SOURCE_DIR)/$(NI-LOGO-STUFF) \ - $(SOURCE_DIR)/$(NI-NEUTRINO) \ - $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS) \ - $(SOURCE_DIR)/$(NI-OFGWRITE) \ - $(SOURCE_DIR)/$(NI-OPENTHREADS) \ - $(SOURCE_DIR)/$(NI-RTMPDUMP) \ - $(SOURCE_DIR)/$(NI-STREAMRIPPER) + $(BUILD_GENERIC_PC) \ + $(SOURCE_DIR)/$(NI_DRIVERS_BIN) \ + $(SOURCE_DIR)/$(NI_FFMPEG) \ + $(SOURCE_DIR)/$(NI_LIBSTB_HAL) \ + $(SOURCE_DIR)/$(NI_LINUX_KERNEL) \ + $(SOURCE_DIR)/$(NI_LOGO_STUFF) \ + $(SOURCE_DIR)/$(NI_NEUTRINO) \ + $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS) \ + $(SOURCE_DIR)/$(NI_OFGWRITE) \ + $(SOURCE_DIR)/$(NI_OPENTHREADS) \ + $(SOURCE_DIR)/$(NI_RTMPDUMP) \ + $(SOURCE_DIR)/$(NI_STREAMRIPPER) URL_OLD = $(BITBUCKET_SSH):neutrino-images URL_NEW = $(if $(filter $(USE_SSH),y),$(GITHUB_SSH):neutrino-images,$(GITHUB)/neutrino-images) diff --git a/make/buildsystem-utils.mk b/make/buildsystem-utils.mk index db958f68..d2fdf90e 100644 --- a/make/buildsystem-utils.mk +++ b/make/buildsystem-utils.mk @@ -46,8 +46,8 @@ SHARP_SIGN := \# # implementation that avoids the use of __tmp, but that would be even # more unreadable and is not worth the effort. -[LOWER] := a b c d e f g h i j k l m n o p q r s t u v w x y z -[UPPER] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z +[LOWER] := a b c d e f g h i j k l m n o p q r s t u v w x y z - . +[UPPER] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ _ define caseconvert-helper $(1) = $$(strip \ @@ -69,11 +69,21 @@ reverse = $(if $(1),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword # slashes, colons (OK in filenames but not in rules), and spaces. sanitize = $(subst $(space),_,$(subst :,_,$(subst /,_,$(strip $(1))))) -# MESSAGE Macro -- display a message in bold type -MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(call qstrip,$(1))$(TERM_RESET)" +TERM_RED = \033[40;0;31m +TERM_RED_BOLD = \033[40;1;31m +TERM_GREEN = \033[40;0;32m +TERM_GREEN_BOLD = \033[40;1;32m +TERM_YELLOW = \033[40;0;33m +TERM_YELLOW_BOLD= \033[40;1;33m +TERM_NORMAL = \033[0m + TERM_BOLD := $(shell tput smso 2>/dev/null) TERM_RESET := $(shell tput rmso 2>/dev/null) +# MESSAGE Macro -- display a message in bold type +MESSAGE = echo -e "$(TERM_YELLOW)$(call qstrip,$(1))$(TERM_NORMAL)" +#MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(call qstrip,$(1))$(TERM_RESET)" + # Utility functions for 'find' # findfileclauses(filelist) => -name 'X' -o -name 'Y' findfileclauses = $(call notfirstword,$(patsubst %,-o -name '%',$(1))) @@ -135,3 +145,35 @@ define PRINTF $(subst $(QUOTE),$(QUOTE)\$(QUOTE)$(QUOTE),\ $(subst \,\\,$(1)))))\n' endef + +# +# $(1) = title +# $(2) = color +# 0 - Black +# 1 - Red +# 2 - Green +# 3 - Yellow +# 4 - Blue +# 5 - Magenta +# 6 - Cyan +# 7 - White +# $(3) = left|center|right +# +define draw_line + @ \ + printf '%.0s-' {1..$(shell tput cols)}; \ + if test "$(1)"; then \ + cols=$(shell tput cols); \ + length=$(shell echo $(1) | awk '{print length}'); \ + case "$(3)" in \ + *right) let indent="length + 1" ;; \ + *center) let indent="cols - (cols - length) / 2" ;; \ + *left|*) let indent="cols" ;; \ + esac; \ + tput cub $$indent; \ + test "$(2)" && printf $$(tput setaf $(2)); \ + printf '$(1)'; \ + test "$(2)" && printf $$(tput sgr0); \ + fi; \ + echo +endef diff --git a/make/crosstool.mk b/make/crosstool.mk index 527728af..b453510b 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -49,62 +49,62 @@ kernel-tarball: $(BUILD_DIR)/linux-$(KERNEL_VER).tar # create kernel-tarball $(BUILD_DIR)/linux-$(KERNEL_VER).tar: | $(BUILD_DIR) - $(MAKE) kernel.do_prepare.$(if $(filter $(KERNEL_SOURCE),git),git,tar) + $(MAKE) kernel.do_prepare_$(if $(filter $(KERNEL_SOURCE),git),git,tar) tar cf $(@) --exclude-vcs -C $(BUILD_DIR)/$(KERNEL_DIR) . # ----------------------------------------------------------------------------- -CROSSTOOL-NG_VER = git -CROSSTOOL-NG_DIR = crosstool-ng.$(CROSSTOOL-NG_VER) -CROSSTOOL-NG_SOURCE = crosstool-ng.$(CROSSTOOL-NG_VER) -CROSSTOOL-NG_SITE = https://github.com/neutrino-images +CROSSTOOL_NG_VER = git +CROSSTOOL_NG_DIR = crosstool-ng.$(CROSSTOOL_NG_VER) +CROSSTOOL_NG_SOURCE = crosstool-ng.$(CROSSTOOL_NG_VER) +CROSSTOOL_NG_SITE = https://github.com/neutrino-images -CROSSTOOL-NG_PATCH = crosstool-ng-bash-version.patch +CROSSTOOL_NG_PATCH = crosstool-ng-bash-version.patch -CROSSTOOL-NG_CONFIG = $(CONFIGS)/ct-ng-$(BOXTYPE).config +CROSSTOOL_NG_CONFIG = $(PACKAGE_DIR)/crosstool-ng/files/ct-ng-$(BOXTYPE).config ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) - CROSSTOOL-NG_CONFIG = $(CONFIGS)/ct-ng-$(BOXTYPE)-$(BOXSERIES).config + CROSSTOOL_NG_CONFIG = $(PACKAGE_DIR)/crosstool-ng/files/ct-ng-$(BOXTYPE)-$(BOXSERIES).config endif # crosstool for hd2 depends on gcc-linaro -GCC-LINARO_VER = 4.9-2017.01 -GCC-LINARO_SOURCE = gcc-linaro-$(GCC-LINARO_VER).tar.xz -GCC-LINARO_SITE = https://releases.linaro.org/components/toolchain/gcc-linaro/$(GCC-LINARO_VER) +GCC_LINARO_VER = 4.9-2017.01 +GCC_LINARO_SOURCE = gcc-linaro-$(GCC_LINARO_VER).tar.xz +GCC_LINARO_SITE = https://releases.linaro.org/components/toolchain/gcc-linaro/$(GCC_LINARO_VER) -$(DL_DIR)/$(GCC-LINARO_SOURCE): - $(DOWNLOAD) $(GCC-LINARO_SITE)/$(GCC-LINARO_SOURCE) +$(DL_DIR)/$(GCC_LINARO_SOURCE): + $(DOWNLOAD) $(GCC_LINARO_SITE)/$(GCC_LINARO_SOURCE) UCLIBC_VER = 1.0.24 # ----------------------------------------------------------------------------- # crosstool for arm-hd2 depends on gcc-linaro -$(CROSS_BASE)/arm/hd2: $(DL_DIR)/$(GCC-LINARO_SOURCE) +$(CROSS_BASE)/arm/hd2: $(DL_DIR)/$(GCC_LINARO_SOURCE) $(CROSS_DIR): | $(BUILD_DIR) make $(BUILD_DIR)/linux-$(KERNEL_VER).tar # - $(REMOVE)/$(CROSSTOOL-NG_DIR) - $(GET-GIT-SOURCE) $(CROSSTOOL-NG_SITE)/$(CROSSTOOL-NG_SOURCE) $(DL_DIR)/$(CROSSTOOL-NG_SOURCE) - $(CPDIR)/$(CROSSTOOL-NG_SOURCE) + $(REMOVE)/$(CROSSTOOL_NG_DIR) + $(GET-GIT-SOURCE) $(CROSSTOOL_NG_SITE)/$(CROSSTOOL_NG_SOURCE) $(DL_DIR)/$(CROSSTOOL_NG_SOURCE) + $(CPDIR)/$(CROSSTOOL_NG_SOURCE) ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) - $(CHDIR)/$(CROSSTOOL-NG_DIR); \ + $(CHDIR)/$(CROSSTOOL_NG_DIR); \ git checkout 1dbb06f2; \ - $(call apply_patches,$(CROSSTOOL-NG_PATCH)) + $(call apply_patches,$(PACKAGE_DIR)/crosstool-ng/patches/$(CROSSTOOL_NG_PATCH)) ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2)) - $(CHDIR)/$(CROSSTOOL-NG_DIR); \ - $(INSTALL_COPY) $(PATCHES)/crosstool-ng/gcc/* patches/gcc/linaro-6.3-2017.02 + $(CHDIR)/$(CROSSTOOL_NG_DIR); \ + $(INSTALL_COPY) $(PACKAGE_DIR)/crosstool-ng/patches/gcc/* patches/gcc/linaro-6.3-2017.02 endif endif - $(CHDIR)/$(CROSSTOOL-NG_DIR); \ + $(CHDIR)/$(CROSSTOOL_NG_DIR); \ unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE; \ - $(INSTALL_DATA) $(CROSSTOOL-NG_CONFIG) .config; \ + $(INSTALL_DATA) $(CROSSTOOL_NG_CONFIG) .config; \ $(SED) "s|^CT_PARALLEL_JOBS=.*|CT_PARALLEL_JOBS=$(PARALLEL_JOBS)|" .config; \ export NI_LOCAL_TARBALLS_DIR=$(DL_DIR); \ export NI_PREFIX_DIR=$(@); \ export NI_KERNEL_VERSION=$(KERNEL_VER); \ export NI_KERNEL_LOCATION=$(BUILD_DIR)/linux-$(KERNEL_VER).tar; \ - export NI_LIBC_UCLIBC_CONFIG_FILE=$(CONFIGS)/ct-ng-uClibc-$(UCLIBC_VER).config; \ + export NI_LIBC_UCLIBC_CONFIG_FILE=$(PACKAGE_DIR)/crosstool-ng/files/ct-ng-uClibc-$(UCLIBC_VER).config; \ export LD_LIBRARY_PATH=; \ test -f ./configure || ./bootstrap; \ ./configure --enable-local; \ @@ -117,7 +117,7 @@ ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) endif test -e $(CROSS_DIR)/$(TARGET)/lib || ln -sf sys-root/lib $(CROSS_DIR)/$(TARGET)/ rm -f $(CROSS_DIR)/$(TARGET)/sys-root/lib/libstdc++.so.6.0.*-gdb.py - $(REMOVE)/$(CROSSTOOL-NG_DIR) + $(REMOVE)/$(CROSSTOOL_NG_DIR) # ----------------------------------------------------------------------------- diff --git a/make/environment-build.mk b/make/environment-build.mk index 292eb9fc..8a9358e1 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -3,33 +3,40 @@ # # ----------------------------------------------------------------------------- -CONFIG_SITE = -export CONFIG_SITE - LD_LIBRARY_PATH = export LD_LIBRARY_PATH SHELL := /bin/bash -# empty variable EMPTY for smoother comparisons -EMPTY = - # ----------------------------------------------------------------------------- -# set up default parallelism -PARALLEL_JOBS := $(shell echo $$((1 + `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`))) -override MAKE = make $(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS)) +ifndef MAKE +MAKE := make +endif +ifndef HOSTMAKE +HOSTMAKE = $(MAKE) +endif +HOSTMAKE := $(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make) -MAKE1 = make -j1 +PARALLEL_JOBS := $(shell echo \ + $$((1 + `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`))) + +MAKE1 := $(HOSTMAKE) -j1 +override MAKE = $(HOSTMAKE) \ + $(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS)) MAKEFLAGS += --no-print-directory #MAKEFLAGS += --silent +TARGET_VENDOR = NI-Buildsystem + +TARGET_OS = linux + # ----------------------------------------------------------------------------- ifeq ($(BOXSERIES),hd1) - DRIVERS-BIN_DIR = $(BOXTYPE)/$(BOXFAMILY) - CORTEX-STRINGS_LDFLAG = + DRIVERS_BIN_DIR = $(BOXTYPE)/$(BOXFAMILY) + CORTEX_STRINGS_LDFLAG = TARGET = arm-cx2450x-linux-gnueabi TARGET_OPTIMIZATION = -Os TARGET_DEBUGGING = -g @@ -42,8 +49,8 @@ ifeq ($(BOXSERIES),hd1) CXX11_ABI = else ifeq ($(BOXSERIES),hd2) - DRIVERS-BIN_DIR = $(BOXTYPE)/$(BOXFAMILY) - CORTEX-STRINGS_LDFLAG = -lcortex-strings + DRIVERS_BIN_DIR = $(BOXTYPE)/$(BOXFAMILY) + CORTEX_STRINGS_LDFLAG = -lcortex-strings TARGET = arm-cortex-linux-uclibcgnueabi TARGET_OPTIMIZATION = -O2 TARGET_DEBUGGING = -g @@ -61,8 +68,8 @@ else ifeq ($(BOXSERIES),hd2) CXX11_ABI = -D_GLIBCXX_USE_CXX11_ABI=0 else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) - DRIVERS-BIN_DIR = $(BOXTYPE)/$(BOXMODEL) - CORTEX-STRINGS_LDFLAG = -lcortex-strings + DRIVERS_BIN_DIR = $(BOXTYPE)/$(BOXMODEL) + CORTEX_STRINGS_LDFLAG = -lcortex-strings TARGET = arm-cortex-linux-gnueabihf TARGET_OPTIMIZATION = -O2 TARGET_DEBUGGING = -g @@ -75,8 +82,8 @@ else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4k CXX11_ABI = else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),vuduo)) - DRIVERS-BIN_DIR = $(BOXTYPE)/$(BOXMODEL) - CORTEX-STRINGS_LDFLAG = + DRIVERS_BIN_DIR = $(BOXTYPE)/$(BOXMODEL) + CORTEX_STRINGS_LDFLAG = TARGET = mipsel-unknown-linux-gnu TARGET_OPTIMIZATION = -O2 TARGET_DEBUGGING = -g @@ -116,12 +123,13 @@ STATIC_BASE = $(BASE_DIR)/static STATIC_DIR = $(STATIC_BASE)/$(TARGET_ARCH)-linux-$(KERNEL_VER) CONFIGS = $(BASE_DIR)/configs PATCHES = $(BASE_DIR)/patches -SKEL-ROOT = $(BASE_DIR)/skel-root/$(BOXSERIES) +SKEL_ROOT = $(BASE_DIR)/skel-root/$(BOXSERIES) ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) - SKEL-ROOT = $(BASE_DIR)/skel-root/vuplus + SKEL_ROOT = $(BASE_DIR)/skel-root/vuplus endif TARGET_FILES = $(BASE_DIR)/skel-root/general BOOTMENU_DIR = $(BASE_DIR)/bootmenu +PACKAGE_DIR = $(BASE_DIR)/package BUILD ?= $(shell /usr/share/libtool/config/config.guess 2>/dev/null || /usr/share/misc/config.guess 2>/dev/null) @@ -131,19 +139,6 @@ include make/environment-host.mk # ----------------------------------------------------------------------------- -PKG_NAME = $(basename $(@F)) -PKG_UPPER = $(call UPPERCASE,$(PKG_NAME)) -PKG_LOWER = $(call LOWERCASE,$(PKG_NAME)) -PKG_VER = $($(PKG_UPPER)_VER) -PKG_DIR = $($(PKG_UPPER)_DIR) -PKG_SOURCE = $($(PKG_UPPER)_SOURCE) -PKG_SITE = $($(PKG_UPPER)_SITE) -PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_DIR) -PKG_FILES_DIR = $(BASE_DIR)/package/$(subst host-,,$(PKG_NAME))/files -PKG_PATCHES_DIR = $(PATCHES)/$(subst host-,,$(PKG_NAME)) - -# ----------------------------------------------------------------------------- - CCACHE = /usr/bin/ccache CCACHE_DIR = $(HOME)/.ccache-ni-buildsystem-$(TARGET_ARCH)-linux-$(KERNEL_VER) export CCACHE_DIR @@ -164,7 +159,7 @@ STATIC_libdir = $(STATIC_DIR)/$(prefix)/lib TARGET_CFLAGS = -pipe $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_ABI) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -I$(TARGET_includedir) TARGET_CPPFLAGS = $(TARGET_CFLAGS) TARGET_CXXFLAGS = $(TARGET_CFLAGS) -TARGET_LDFLAGS = $(CORTEX-STRINGS_LDFLAG) $(TARGET_EXTRA_LDFLAGS) +TARGET_LDFLAGS = $(CORTEX_STRINGS_LDFLAG) $(TARGET_EXTRA_LDFLAGS) TARGET_LDFLAGS += -L$(TARGET_base_libdir) -L$(TARGET_libdir) TARGET_LDFLAGS += -Wl,-rpath,$(TARGET_libdir) -Wl,-rpath-link,$(TARGET_libdir) TARGET_LDFLAGS += -Wl,-O1 @@ -179,24 +174,14 @@ TARGET_CPP = $(TARGET_CROSS)cpp TARGET_CXX = $(TARGET_CROSS)g++ TARGET_LD = $(TARGET_CROSS)ld TARGET_NM = $(TARGET_CROSS)nm -TARGET_OBJCOPY = $(TARGET_CROSS)objcopy -TARGET_OBJDUMP = $(TARGET_CROSS)objdump TARGET_RANLIB = $(TARGET_CROSS)ranlib TARGET_READELF = $(TARGET_CROSS)readelf +TARGET_OBJCOPY = $(TARGET_CROSS)objcopy +TARGET_OBJDUMP = $(TARGET_CROSS)objdump TARGET_STRIP = $(TARGET_CROSS)strip # ----------------------------------------------------------------------------- -TERM_RED = \033[40;0;31m -TERM_RED_BOLD = \033[40;1;31m -TERM_GREEN = \033[40;0;32m -TERM_GREEN_BOLD = \033[40;1;32m -TERM_YELLOW = \033[40;0;33m -TERM_YELLOW_BOLD= \033[40;1;33m -TERM_NORMAL = \033[0m - -# ----------------------------------------------------------------------------- - # search path(s) for all prerequisites VPATH = $(DEPS_DIR) $(HOST_DEPS_DIR) @@ -211,48 +196,29 @@ PKG_CONFIG_SYSROOT_DIR=$(TARGET_DIR) # ----------------------------------------------------------------------------- -# download archives into download directory -DOWNLOAD = wget --no-check-certificate -t3 -T60 -c -P $(DL_DIR) - -# unpack archives into build directory -UNTAR = tar -C $(BUILD_DIR) -xf $(DL_DIR) -UNZIP = unzip -d $(BUILD_DIR) -o $(DL_DIR) - -# clean up -REMOVE = rm -rf $(BUILD_DIR) - -# apply patches -PATCH = patch -p1 -i $(PATCHES) - -# build helper variables -CD = set -e; cd -CHDIR = $(CD) $(BUILD_DIR) -MKDIR = mkdir -p $(BUILD_DIR) -CPDIR = cp -a -t $(BUILD_DIR) $(DL_DIR) -#TOUCH = @touch $(DEPS_DIR)/$(@) -TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@) -SED = $(shell which sed || type -p sed) -i -e - -INSTALL = install -INSTALL_DATA = $(INSTALL) -m 0644 -INSTALL_EXEC = $(INSTALL) -m 0755 -INSTALL_COPY = cp -a - -define INSTALL_EXIST # (source, dest) - if [ -d $(dir $(1)) ]; then \ - $(INSTALL) -d $(2); \ - $(INSTALL_COPY) $(1) $(2); \ - fi -endef +PKG_NAME = $(basename $(@F)) +PKG_UPPER = $(call UPPERCASE,$(PKG_NAME)) +PKG_LOWER = $(call LOWERCASE,$(PKG_NAME)) +PKG = $(PKG_UPPER) + +PKG_VER = $($(PKG)_VER) +PKG_DIR = $($(PKG)_DIR) +PKG_SOURCE = $($(PKG)_SOURCE) +PKG_SITE = $($(PKG)_SITE) +PKG_PATCH = $($(PKG)_PATCH) + +PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_DIR) +PKG_FILES_DIR = $(PACKAGE_DIR)/$(subst host-,,$(PKG_NAME))/files +PKG_PATCHES_DIR = $(PACKAGE_DIR)/$(subst host-,,$(PKG_NAME))/patches -GET-GIT-ARCHIVE = $(HELPERS_DIR)/get-git-archive.sh -GET-GIT-SOURCE = $(HELPERS_DIR)/get-git-source.sh -GET-SVN-SOURCE = $(HELPERS_DIR)/get-svn-source.sh -UPDATE-RC.D = $(HELPERS_DIR)/update-rc.d -r $(TARGET_DIR) +PKG_CHDIR = $(CD) $(PKG_BUILD_DIR) # ----------------------------------------------------------------------------- -MAKE_OPTS = \ +#TARGET_MAKE_ENV = \ +# $($(PKG)_MAKE_ENV) + +TARGET_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ CC="$(TARGET_CC)" \ GCC="$(TARGET_CC)" \ @@ -269,31 +235,122 @@ MAKE_OPTS = \ STRIP="$(TARGET_STRIP)" \ ARCH=$(TARGET_ARCH) -MAKE_ENV = \ - $(MAKE_OPTS) \ - \ +#TARGET_MAKE_OPTS += \ +# $($(PKG)_MAKE_OPTS) + +#HOST_MAKE_ENV = \ +# $($(PKG)_MAKE_ENV) + +#HOST_MAKE_OPTS += \ +# $($(PKG)_MAKE_OPTS) + +# ----------------------------------------------------------------------------- + +TARGET_CONFIGURE_ENV = \ + $(TARGET_MAKE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS)" \ CXXFLAGS="$(TARGET_CXXFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" -MAKE_ENV += \ +TARGET_CONFIGURE_ENV += \ PKG_CONFIG=$(PKG_CONFIG) \ PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \ PKG_CONFIG_SYSROOT_DIR=$(PKG_CONFIG_SYSROOT_DIR) -CONFIGURE_OPTS = \ +TARGET_CONFIGURE_ENV += \ + $($(PKG)_CONF_ENV) + +TARGET_CONFIGURE_OPTS = \ --build=$(BUILD) \ --host=$(TARGET) \ --target=$(TARGET) \ \ - --program-prefix= \ - --program-suffix= + --program-prefix="" \ + --program-suffix="" \ + \ + --prefix=$(prefix) \ + --exec_prefix=$(exec_prefix) \ + --sysconfdir=$(sysconfdir) \ + --localstatedir=$(localstatedir) \ + \ + --mandir=$(REMOVE_mandir) \ + --infodir=$(REMOVE_infodir) + +TARGET_CONFIGURE_OPTS += \ + $($(PKG)_CONF_OPTS) + +#HOST_CONFIGURE_ENV = \ +# $($(PKG)_CONF_ENV) + +#HOST_CONFIGURE_OPTS = \ +# $($(PKG)_CONF_OPTS) CONFIGURE = \ + if [ "$($(PKG)_AUTORECONF)" == "YES" ]; then \ + $(call MESSAGE,"Autoreconfiguring"); \ + $($(PKG)_AUTORECONF_ENV) autoreconf -fi $($(PKG)_AUTORECONF_OPTS); \ + fi; \ test -f ./configure || ./autogen.sh && \ - $(MAKE_ENV) \ - ./configure $(CONFIGURE_OPTS) + CONFIG_SITE=/dev/null \ + $(TARGET_CONFIGURE_ENV) ./configure $(TARGET_CONFIGURE_OPTS) + +# ----------------------------------------------------------------------------- + +TARGET_CMAKE_ENV = \ + $($(PKG)_CONF_ENV) + +TARGET_CMAKE_OPTS = \ + --no-warn-unused-cli + +TARGET_CMAKE_OPTS += \ + -DENABLE_STATIC=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_DOC=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLE=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TEST=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_TESTING=OFF \ + -DCMAKE_BUILD_TYPE="None" \ + -DCMAKE_SYSTEM_NAME="Linux" \ + -DCMAKE_SYSTEM_PROCESSOR="$(TARGET_ARCH)" \ + -DCMAKE_INSTALL_PREFIX="$(prefix)" \ + -DCMAKE_INSTALL_DOCDIR="$(REMOVE_docdir)" \ + -DCMAKE_INSTALL_MANDIR="$(REMOVE_mandir)" \ + -DCMAKE_PREFIX_PATH="$(TARGET_DIR)" \ + -DCMAKE_INCLUDE_PATH="$(TARGET_includedir)" \ + -DCMAKE_C_COMPILER="$(TARGET_CC)" \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \ + -DCMAKE_CPP_COMPILER="$(TARGET_CPP)" \ + -DCMAKE_CPP_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \ + -DCMAKE_CXX_COMPILER="$(TARGET_CXX)" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \ + -DCMAKE_LINKER="$(TARGET_LD)" \ + -DCMAKE_AR="$(TARGET_AR)" \ + -DCMAKE_AS="$(TARGET_AS)" \ + -DCMAKE_NM="$(TARGET_NM)" \ + -DCMAKE_OBJCOPY="$(TARGET_OBJCOPY)" \ + -DCMAKE_OBJDUMP="$(TARGET_OBJDUMP)" \ + -DCMAKE_RANLIB="$(TARGET_RANLIB)" \ + -DCMAKE_READELF="$(TARGET_READELF)" \ + -DCMAKE_STRIP="$(TARGET_STRIP)" + +TARGET_CMAKE_OPTS += \ + $($(PKG)_CONF_OPTS) + +#HOST_CMAKE_ENV = \ +# $($(PKG)_CONF_ENV) + +#HOST_CMAKE_OPTS = \ +# $($(PKG)_CONF_OPTS) + +CMAKE = \ + rm -f CMakeCache.txt; \ + $(TARGET_CMAKE_ENV) cmake $(TARGET_CMAKE_OPTS) + +# ----------------------------------------------------------------------------- define meson-cross-config # (dest dir) mkdir -p $(1) @@ -329,8 +386,6 @@ define meson-cross-config # (dest dir) ) > $(1)/meson-cross.config endef -# ----------------------------------------------------------------------------- - MESON_CONFIGURE = \ $(call meson-cross-config,$(PKG_BUILD_DIR)/build); \ unset CC CXX CPP LD AR NM STRIP; \ @@ -349,39 +404,6 @@ NINJA_INSTALL = DESTDIR=$(TARGET_DIR) \ # ----------------------------------------------------------------------------- -CMAKE_OPTS = \ - -DBUILD_SHARED_LIBS=ON \ - -DENABLE_STATIC=OFF \ - -DCMAKE_BUILD_TYPE="None" \ - -DCMAKE_SYSTEM_NAME="Linux" \ - -DCMAKE_SYSTEM_PROCESSOR="$(TARGET_ARCH)" \ - -DCMAKE_INSTALL_PREFIX="$(prefix)" \ - -DCMAKE_INSTALL_DOCDIR="$(REMOVE_docdir)" \ - -DCMAKE_INSTALL_MANDIR="$(REMOVE_mandir)" \ - -DCMAKE_PREFIX_PATH="$(TARGET_DIR)" \ - -DCMAKE_INCLUDE_PATH="$(TARGET_includedir)" \ - -DCMAKE_C_COMPILER="$(TARGET_CC)" \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \ - -DCMAKE_CPP_COMPILER="$(TARGET_CPP)" \ - -DCMAKE_CPP_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \ - -DCMAKE_CXX_COMPILER="$(TARGET_CXX)" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \ - -DCMAKE_LINKER="$(TARGET_LD)" \ - -DCMAKE_AR="$(TARGET_AR)" \ - -DCMAKE_AS="$(TARGET_AS)" \ - -DCMAKE_NM="$(TARGET_NM)" \ - -DCMAKE_OBJCOPY="$(TARGET_OBJCOPY)" \ - -DCMAKE_OBJDUMP="$(TARGET_OBJDUMP)" \ - -DCMAKE_RANLIB="$(TARGET_RANLIB)" \ - -DCMAKE_READELF="$(TARGET_READELF)" \ - -DCMAKE_STRIP="$(TARGET_STRIP)" - -CMAKE = \ - rm -f CMakeCache.txt; \ - cmake --no-warn-unused-cli $(CMAKE_OPTS) - -# ----------------------------------------------------------------------------- - GITHUB = https://github.com GITHUB_SSH = git@github.com BITBUCKET = https://bitbucket.org @@ -390,20 +412,20 @@ BITBUCKET_SSH = git@bitbucket.org GNU_MIRROR = http://ftp.gnu.org/pub/gnu KERNEL_MIRROR = https://cdn.kernel.org/pub -NI-PUBLIC = $(GITHUB)/neutrino-images -NI-PRIVATE = $(BITBUCKET_SSH):neutrino-images - -NI-NEUTRINO = ni-neutrino -NI-NEUTRINO-PLUGINS = ni-neutrino-plugins - -BUILD-GENERIC-PC = build-generic-pc -NI-BUILD-GENERIC-PC = ni-build-generic-pc -NI-DRIVERS-BIN = ni-drivers-bin -NI-FFMPEG = ni-ffmpeg -NI-LIBSTB-HAL = ni-libstb-hal -NI-LINUX-KERNEL = ni-linux-kernel -NI-LOGO-STUFF = ni-logo-stuff -NI-OFGWRITE = ni-ofgwrite -NI-OPENTHREADS = ni-openthreads -NI-RTMPDUMP = ni-rtmpdump -NI-STREAMRIPPER = ni-streamripper +NI_PUBLIC = $(GITHUB)/neutrino-images +NI_PRIVATE = $(BITBUCKET_SSH):neutrino-images + +NI_NEUTRINO = ni-neutrino +NI_NEUTRINO_PLUGINS = ni-neutrino-plugins + +BUILD_GENERIC_PC = build-generic-pc +NI_BUILD_GENERIC_PC = ni-build-generic-pc +NI_DRIVERS_BIN = ni-drivers-bin +NI_FFMPEG = ni-ffmpeg +NI_LIBSTB_HAL = ni-libstb-hal +NI_LINUX_KERNEL = ni-linux-kernel +NI_LOGO_STUFF = ni-logo-stuff +NI_OFGWRITE = ni-ofgwrite +NI_OPENTHREADS = ni-openthreads +NI_RTMPDUMP = ni-rtmpdump +NI_STREAMRIPPER = ni-streamripper diff --git a/make/environment-image.mk b/make/environment-image.mk index 1fbd390b..709bd7c5 100644 --- a/make/environment-image.mk +++ b/make/environment-image.mk @@ -35,22 +35,22 @@ IMAGE_SUMMARIZE = yes IMAGE_NEW = no # Beta/Release Server -NI-SERVER = http://neutrino-images.de/neutrino-images +NI_SERVER = http://neutrino-images.de/neutrino-images ifeq ($(IMAGE_TYPE),0) # Release - NI-SUBDIR = release + NI_SUBDIR = release IMAGE_TYPE_STRING = release else ifeq ($(IMAGE_TYPE),1) # Beta - NI-SUBDIR = beta + NI_SUBDIR = beta IMAGE_TYPE_STRING = beta else ifeq ($(IMAGE_TYPE),2) # Nightly - NI-SUBDIR = nightly + NI_SUBDIR = nightly IMAGE_TYPE_STRING = nightly else # Selfmade; just for compatibility; not needed for our builds - NI-SUBDIR = selfmade + NI_SUBDIR = selfmade IMAGE_TYPE_STRING = selfmade endif @@ -60,7 +60,7 @@ else IMAGE_DESC ="$(BOXNAME) [$(IMAGE_SUFFIX)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')" endif -IMAGE_SITE = $(NI-SERVER)/$(NI-SUBDIR) +IMAGE_SITE = $(NI_SERVER)/$(NI_SUBDIR) IMAGE_MD5FILE = $(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt IMAGE_BUILD_DIR = $(BUILD_DIR)/image-build diff --git a/make/environment-linux.mk b/make/environment-linux.mk index fedc97b3..35ecee78 100644 --- a/make/environment-linux.mk +++ b/make/environment-linux.mk @@ -7,24 +7,24 @@ ifeq ($(BOXMODEL),nevis) KERNEL_VER = 2.6.34.13 KERNEL_DIR = linux-$(KERNEL_VER) KERNEL_SOURCE = git - KERNEL_SITE = $(EMPTY) + KERNEL_SITE = $(empty) KERNEL_BRANCH = ni/linux-2.6.34.15 - KERNEL_DTB = $(EMPTY) + KERNEL_DTB = $(empty) else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner kronos kronos_v2)) KERNEL_VER = 3.10.93 KERNEL_DIR = linux-$(KERNEL_VER) KERNEL_SOURCE = git - KERNEL_SITE = $(EMPTY) + KERNEL_SITE = $(empty) KERNEL_BRANCH = ni/linux-3.10.108 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner)) - KERNEL_DTB = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/kernel-dtb/hd849x.dtb - KERNEL_CONFIG = $(CONFIGS)/kernel-apollo.config + KERNEL_DTB = $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/kernel-dtb/hd849x.dtb + KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-apollo.defconfig else - KERNEL_DTB = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/kernel-dtb/en75x1.dtb - KERNEL_CONFIG = $(CONFIGS)/kernel-kronos.config + KERNEL_DTB = $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/kernel-dtb/en75x1.dtb + KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-kronos.defconfig endif else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7)) @@ -33,9 +33,9 @@ else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7)) KERNEL_SOURCE = linux-$(KERNEL_VER)-arm.tar.gz KERNEL_SITE = http://downloads.mutant-digital.net - KERNEL_BRANCH = $(EMPTY) + KERNEL_BRANCH = $(empty) KERNEL_DTB = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/bcm7445-bcm97445svmb.dtb - KERNEL_CONFIG = $(CONFIGS)/kernel-hd5x.config + KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-hd5x.defconfig BOOT_PARTITION = 1 @@ -46,9 +46,9 @@ else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60)) KERNEL_SOURCE = linux-$(KERNEL_VER)-$(KERNEL_DATE)-arm.tar.gz KERNEL_SITE = http://source.mynonpublic.com/gfutures - KERNEL_BRANCH = $(EMPTY) + KERNEL_BRANCH = $(empty) KERNEL_DTB = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/hi3798mv200.dtb - KERNEL_CONFIG = $(CONFIGS)/kernel-hd6x.config + KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-hd6x.defconfig BOOT_PARTITION = 4 @@ -59,9 +59,9 @@ else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd61)) KERNEL_SOURCE = linux-$(KERNEL_VER)-$(KERNEL_DATE)-arm.tar.gz KERNEL_SITE = http://source.mynonpublic.com/gfutures - KERNEL_BRANCH = $(EMPTY) + KERNEL_BRANCH = $(empty) KERNEL_DTB = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/hi3798mv200.dtb - KERNEL_CONFIG = $(CONFIGS)/kernel-hd6x.config + KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-hd6x.defconfig BOOT_PARTITION = 4 @@ -71,13 +71,13 @@ else ifeq ($(BOXMODEL),vusolo4k) KERNEL_SOURCE = stblinux-3.14-1.8.tar.bz2 KERNEL_SITE = http://code.vuplus.com/download/release/kernel - KERNEL_BRANCH = $(EMPTY) - KERNEL_DTB = $(EMPTY) + KERNEL_BRANCH = $(empty) + KERNEL_DTB = $(empty) - VMLINUZ-INITRD_VER = 20190911 - VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz - VMLINUZ-INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ-INITRD = vmlinuz-initrd-7366c0 + VMLINUZ_INITRD_VER = 20190911 + VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz + VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ_INITRD = vmlinuz-initrd-7366c0 BOOT_PARTITION = 1 @@ -87,13 +87,13 @@ else ifeq ($(BOXMODEL),vuduo4k) KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2 KERNEL_SITE = http://code.vuplus.com/download/release/kernel - KERNEL_BRANCH = $(EMPTY) - KERNEL_DTB = $(EMPTY) + KERNEL_BRANCH = $(empty) + KERNEL_DTB = $(empty) - VMLINUZ-INITRD_VER = 20190911 - VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz - VMLINUZ-INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ-INITRD = vmlinuz-initrd-7278b1 + VMLINUZ_INITRD_VER = 20190911 + VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz + VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ_INITRD = vmlinuz-initrd-7278b1 BOOT_PARTITION = 6 @@ -103,13 +103,13 @@ else ifeq ($(BOXMODEL),vuduo4kse) KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2 KERNEL_SITE = http://code.vuplus.com/download/release/kernel - KERNEL_BRANCH = $(EMPTY) - KERNEL_DTB = $(EMPTY) + KERNEL_BRANCH = $(empty) + KERNEL_DTB = $(empty) - VMLINUZ-INITRD_VER = 20201010 - VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz - VMLINUZ-INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ-INITRD = vmlinuz-initrd-7445d0 + VMLINUZ_INITRD_VER = 20201010 + VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz + VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ_INITRD = vmlinuz-initrd-7445d0 BOOT_PARTITION = 6 @@ -119,13 +119,13 @@ else ifeq ($(BOXMODEL),vuultimo4k) KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2 KERNEL_SITE = http://code.vuplus.com/download/release/kernel - KERNEL_BRANCH = $(EMPTY) - KERNEL_DTB = $(EMPTY) + KERNEL_BRANCH = $(empty) + KERNEL_DTB = $(empty) - VMLINUZ-INITRD_VER = 20190911 - VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz - VMLINUZ-INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ-INITRD = vmlinuz-initrd-7445d0 + VMLINUZ_INITRD_VER = 20190911 + VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz + VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ_INITRD = vmlinuz-initrd-7445d0 BOOT_PARTITION = 1 @@ -135,13 +135,13 @@ else ifeq ($(BOXMODEL),vuzero4k) KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2 KERNEL_SITE = http://code.vuplus.com/download/release/kernel - KERNEL_BRANCH = $(EMPTY) - KERNEL_DTB = $(EMPTY) + KERNEL_BRANCH = $(empty) + KERNEL_DTB = $(empty) - VMLINUZ-INITRD_VER = 20190911 - VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz - VMLINUZ-INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ-INITRD = vmlinuz-initrd-7260a0 + VMLINUZ_INITRD_VER = 20190911 + VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz + VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ_INITRD = vmlinuz-initrd-7260a0 BOOT_PARTITION = 4 @@ -151,13 +151,13 @@ else ifeq ($(BOXMODEL),vuuno4k) KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2 KERNEL_SITE = http://code.vuplus.com/download/release/kernel - KERNEL_BRANCH = $(EMPTY) - KERNEL_DTB = $(EMPTY) + KERNEL_BRANCH = $(empty) + KERNEL_DTB = $(empty) - VMLINUZ-INITRD_VER = 20191010 - VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz - VMLINUZ-INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ-INITRD = vmlinuz-initrd-7439b0 + VMLINUZ_INITRD_VER = 20191010 + VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz + VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ_INITRD = vmlinuz-initrd-7439b0 BOOT_PARTITION = 1 @@ -167,13 +167,13 @@ else ifeq ($(BOXMODEL),vuuno4kse) KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2 KERNEL_SITE = http://code.vuplus.com/download/release/kernel - KERNEL_BRANCH = $(EMPTY) - KERNEL_DTB = $(EMPTY) + KERNEL_BRANCH = $(empty) + KERNEL_DTB = $(empty) - VMLINUZ-INITRD_VER = 20191010 - VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz - VMLINUZ-INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ-INITRD = vmlinuz-initrd-7439b0 + VMLINUZ_INITRD_VER = 20191010 + VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz + VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ_INITRD = vmlinuz-initrd-7439b0 BOOT_PARTITION = 1 @@ -183,8 +183,8 @@ else ifeq ($(BOXMODEL),vuduo) KERNEL_SOURCE = stblinux-$(KERNEL_VER).tar.bz2 KERNEL_SITE = http://code.vuplus.com/download/release/kernel - KERNEL_BRANCH = $(EMPTY) - KERNEL_DTB = $(EMPTY) + KERNEL_BRANCH = $(empty) + KERNEL_DTB = $(empty) endif @@ -194,7 +194,7 @@ KERNEL_OBJ = linux-$(KERNEL_VER)-obj KERNEL_MODULES = linux-$(KERNEL_VER)-modules KERNEL_HEADERS = linux-$(KERNEL_VER)-headers -KERNEL_CONFIG ?= $(CONFIGS)/kernel-$(BOXMODEL).config +KERNEL_CONFIG ?= $(PKG_FILES_DIR)/kernel-$(BOXMODEL).defconfig KERNEL_NAME = NI $(shell echo $(BOXFAMILY) | sed 's/.*/\u&/') Kernel # ----------------------------------------------------------------------------- @@ -212,7 +212,7 @@ KERNEL_VMLINUX = $(BUILD_DIR)/$(KERNEL_OBJ)/vmlinux # ----------------------------------------------------------------------------- -KERNEL_MAKEVARS = \ +KERNEL_MAKE_VARS = \ ARCH=$(TARGET_ARCH) \ CROSS_COMPILE=$(TARGET_CROSS) \ INSTALL_MOD_PATH=$(BUILD_DIR)/$(KERNEL_MODULES) \ @@ -221,7 +221,7 @@ KERNEL_MAKEVARS = \ O=$(BUILD_DIR)/$(KERNEL_OBJ) # Compatibility variables -KERNEL_MAKEVARS += \ +KERNEL_MAKE_VARS += \ KVER=$(KERNEL_VER) \ KSRC=$(BUILD_DIR)/$(KERNEL_DIR) @@ -233,9 +233,9 @@ else KERNEL_IMAGE = zImage endif -KERNEL_MAKEOPTS = $(KERNEL_IMAGE) modules +KERNEL_MAKE_TARGETS = $(KERNEL_IMAGE) # build also the kernel-dtb for arm-hd5x and arm-hd6x ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61)) - KERNEL_MAKEOPTS += $(notdir $(KERNEL_DTB)) + KERNEL_MAKE_TARGETS += $(notdir $(KERNEL_DTB)) endif diff --git a/make/environment-update.mk b/make/environment-update.mk index 34ad8820..12be61c0 100644 --- a/make/environment-update.mk +++ b/make/environment-update.mk @@ -32,7 +32,7 @@ UPDATE_TYPE = U # Addon = A # Text = T -UPDATE_SITE = $(NI-SERVER)/$(NI-SUBDIR) +UPDATE_SITE = $(NI_SERVER)/$(NI_SUBDIR) UPDATE_MD5FILE = update.txt -UPDATE_MD5FILE-BOXSERIES= update-$(BOXTYPE_SC)-$(BOXSERIES).txt -UPDATE_MD5FILE-BOXMODEL = update-$(BOXTYPE_SC)-$(BOXMODEL).txt +UPDATE_MD5FILE_BOXSERIES= update-$(BOXTYPE_SC)-$(BOXSERIES).txt +UPDATE_MD5FILE_BOXMODEL = update-$(BOXTYPE_SC)-$(BOXMODEL).txt diff --git a/make/flash-images.mk b/make/flash-images.mk index 8ee41036..bccb2a0a 100644 --- a/make/flash-images.mk +++ b/make/flash-images.mk @@ -362,7 +362,7 @@ flash-image-vuplus-multi: | $(IMAGE_DIR) rm -rf $(IMAGE_BUILD_DIR) mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR) cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash_auto.bin - cp $(BUILD_DIR)/$(VMLINUZ-INITRD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/initrd_auto.bin + cp $(BUILD_DIR)/$(VMLINUZ_INITRD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/initrd_auto.bin echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel_auto.bin cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel1_auto.bin cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel2_auto.bin diff --git a/make/flash-updates.mk b/make/flash-updates.mk index aff3c8ff..e1974ff2 100644 --- a/make/flash-updates.mk +++ b/make/flash-updates.mk @@ -45,7 +45,7 @@ ifneq ($(DEBUG),yes) find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true endif $(MAKE) u-update-bin \ - UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXSERIES) + UPDATE_MD5FILE=$(UPDATE_MD5FILE_BOXSERIES) # ----------------------------------------------------------------------------- @@ -63,7 +63,7 @@ ifeq ($(PERSISTENT_VAR_PARTITION),yes) mv $(UPDATE_INST_DIR)/var $(UPDATE_INST_DIR)/var_init endif $(MAKE) u-update-bin \ - UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXSERIES) + UPDATE_MD5FILE=$(UPDATE_MD5FILE_BOXSERIES) # ----------------------------------------------------------------------------- @@ -80,30 +80,30 @@ u-update.urls: update.urls u-pr-auto-timer: $(MAKE) u-init - $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH) - $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH) + $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH) + $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH) mkdir -p $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins - $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ - $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ - $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ - $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ + $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ + $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ + $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ + $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/ mkdir -p $(UPDATE_INST_DIR)/var/tuxbox/config - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/ - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/ - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/ - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/ - PKG_VERSION=`cat $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer | grep '^VERSION' | cut -d= -f2`; \ + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/ + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/ + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/ + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/ + PKG_VERSION=`cat $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer | grep '^VERSION' | cut -d= -f2`; \ $(MAKE) u-update-bin \ UPDATE_MD5FILE=pr-auto-timer.txt \ - UPDATE_SITE=$(NI-SERVER)/plugins/pr-auto-timer \ + UPDATE_SITE=$(NI_SERVER)/plugins/pr-auto-timer \ UPDATE_NAME=pr-auto-timer_$${PKG_VERSION//./} \ UPDATE_DESC=Auto-Timer \ UPDATE_VERSION=$$PKG_VERSION # ----------------------------------------------------------------------------- -CHANNELLISTS_SITE = $(NI-SERVER)/channellists +CHANNELLISTS_SITE = $(NI_SERVER)/channellists CHANNELLISTS_MD5FILE = lists.txt channellists: matze-192 matze-192-130 @@ -125,11 +125,11 @@ matze-192-130: done # sync sat-names with current satellites.xml # Astra 19.2 - P192=`grep -m 1 'position=\"192\"' $(SOURCE_DIR)/$(NI-NEUTRINO)/data/config/satellites.xml`; \ + P192=`grep -m 1 'position=\"192\"' $(SOURCE_DIR)/$(NI_NEUTRINO)/data/config/satellites.xml`; \ P192=`echo $$P192`; \ $(SED) "/position=\"192\"/c\ $$P192" $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/services.xml # Hotbird 13.0 - P130=`grep -m 1 'position=\"130\"' $(SOURCE_DIR)/$(NI-NEUTRINO)/data/config/satellites.xml`; \ + P130=`grep -m 1 'position=\"130\"' $(SOURCE_DIR)/$(NI_NEUTRINO)/data/config/satellites.xml`; \ P130=`echo $$P130`; \ $(SED) "/position=\"130\"/c\ $$P130" $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/services.xml # @@ -165,11 +165,11 @@ initial-settings: matze-192 $(MKDIR)/initial $(CHDIR)/initial && \ tar -xf $(STAGING_DIR)/updates/matze-192.bin && \ - cp temp_inst/inst/var/tuxbox/config/zapit/* $(SOURCE_DIR)/$(NI-NEUTRINO)/data/initial/ - P192=`grep -m 1 'position=\"192\"' $(SOURCE_DIR)/$(NI-NEUTRINO)/data/config/satellites.xml`; \ + cp temp_inst/inst/var/tuxbox/config/zapit/* $(SOURCE_DIR)/$(NI_NEUTRINO)/data/initial/ + P192=`grep -m 1 'position=\"192\"' $(SOURCE_DIR)/$(NI_NEUTRINO)/data/config/satellites.xml`; \ P192=`echo $$P192`; \ - $(SED) "/position=\"192\"/c\ $$P192" $(SOURCE_DIR)/$(NI-NEUTRINO)/data/initial/services.xml - @echo -e "$(TERM_YELLOW)Commit your changes in $(SOURCE_DIR)/$(NI-NEUTRINO)/data/initial$(TERM_NORMAL)" + $(SED) "/position=\"192\"/c\ $$P192" $(SOURCE_DIR)/$(NI_NEUTRINO)/data/initial/services.xml + @echo -e "$(TERM_YELLOW)Commit your changes in $(SOURCE_DIR)/$(NI_NEUTRINO)/data/initial$(TERM_NORMAL)" # ----------------------------------------------------------------------------- diff --git a/make/host-tools.mk b/make/host-tools.mk index a8209096..062efc25 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -10,16 +10,16 @@ $(HOST_DIR): # ----------------------------------------------------------------------------- -host-tools: $(HOST_DIR) \ +host-tools: $(BUILD_DIR) $(HOST_DIR) \ host-pkgconf \ $(PKG_CONFIG) \ host-mtd-utils \ - host-mkimage \ + host-u-boot \ host-zic \ host-parted \ host-dosfstools \ host-mtools \ - host-e2fsprocs \ + host-e2fsprogs \ host-lua \ host-luarocks \ host-ccache @@ -46,18 +46,19 @@ HOST_PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf $(DL_DIR)/$(HOST_PKGCONF_SOURCE): $(DOWNLOAD) $(HOST_PKGCONF_SITE)/$(HOST_PKGCONF_SOURCE) +HOST_PKGCONF_CONF_OPTS = \ + --prefix=$(HOST_DIR) + host-pkgconf: $(DL_DIR)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR) pkg-config-preqs - $(REMOVE)/$(HOST_PKGCONF_DIR) - $(UNTAR)/$(HOST_PKGCONF_SOURCE) - $(CHDIR)/$(HOST_PKGCONF_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - ./configure \ - --prefix=$(HOST_DIR) \ - ; \ + $($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ $(MAKE) install $(INSTALL_EXEC) $(PKG_FILES_DIR)/pkg-config.in $(HOST_PKG-CONFIG) - $(REMOVE)/$(HOST_PKGCONF_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -69,85 +70,82 @@ $(PKG_CONFIG): $(PKG_CONFIG_DEPS) | $(HOST_DIR) # ----------------------------------------------------------------------------- -HOST_MTD-UTILS_VER = $(MTD-UTILS_VER) -HOST_MTD-UTILS_DIR = mtd-utils-$(HOST_MTD-UTILS_VER) -HOST_MTD-UTILS_SOURCE = mtd-utils-$(HOST_MTD-UTILS_VER).tar.bz2 -HOST_MTD-UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils - -#$(DL_DIR)/$(HOST_MTD-UTILS_SOURCE): -# $(DOWNLOAD) $(HOST_MTD-UTILS_SITE)/$(HOST_MTD-UTILS_SOURCE) - -host-mtd-utils: $(DL_DIR)/$(HOST_MTD-UTILS_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_MTD-UTILS_DIR) - $(UNTAR)/$(HOST_MTD-UTILS_SOURCE) - $(CHDIR)/$(HOST_MTD-UTILS_DIR); \ - ./configure \ - ZLIB_CFLAGS=" " \ - ZLIB_LIBS="-lz" \ - UUID_CFLAGS=" " \ - UUID_LIBS="-luuid" \ - --prefix= \ - --enable-silent-rules \ - --without-ubifs \ - --without-xattr \ - --disable-tests \ - ; \ +HOST_MTD_UTILS_VER = $(MTD_UTILS_VER) +HOST_MTD_UTILS_DIR = mtd-utils-$(HOST_MTD_UTILS_VER) +HOST_MTD_UTILS_SOURCE = mtd-utils-$(HOST_MTD_UTILS_VER).tar.bz2 +HOST_MTD_UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils + +#$(DL_DIR)/$(HOST_MTD_UTILS_SOURCE): +# $(DOWNLOAD) $(HOST_MTD_UTILS_SITE)/$(HOST_MTD_UTILS_SOURCE) + +HOST_MTD_UTILS_CONF_ENV = \ + ZLIB_CFLAGS=" " \ + ZLIB_LIBS="-lz" \ + UUID_CFLAGS=" " \ + UUID_LIBS="-luuid" + +HOST_MTD_UTILS_CONF_OPTS = \ + --prefix= \ + --enable-silent-rules \ + --without-ubifs \ + --without-xattr \ + --disable-tests + +host-mtd-utils: $(DL_DIR)/$(HOST_MTD_UTILS_SOURCE) | $(HOST_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ $(MAKE) install DESTDIR=$(HOST_DIR) - $(REMOVE)/$(HOST_MTD-UTILS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -HOST_U-BOOT_VER = 2018.09 -HOST_U-BOOT_DIR = u-boot-$(HOST_U-BOOT_VER) -HOST_U-BOOT_SOURCE = u-boot-$(HOST_U-BOOT_VER).tar.bz2 -HOST_U-BOOT_SITE = ftp://ftp.denx.de/pub/u-boot +HOST_U_BOOT_VER = 2018.09 +HOST_U_BOOT_DIR = u-boot-$(HOST_U_BOOT_VER) +HOST_U_BOOT_SOURCE = u-boot-$(HOST_U_BOOT_VER).tar.bz2 +HOST_U_BOOT_SITE = ftp://ftp.denx.de/pub/u-boot + +$(DL_DIR)/$(HOST_U_BOOT_SOURCE): + $(DOWNLOAD) $(HOST_U_BOOT_SITE)/$(HOST_U_BOOT_SOURCE) -$(DL_DIR)/$(HOST_U-BOOT_SOURCE): - $(DOWNLOAD) $(HOST_U-BOOT_SITE)/$(HOST_U-BOOT_SOURCE) +HOST_MKIMAGE = $(HOST_DIR)/bin/mkimage -host-mkimage: $(HOST_DIR)/bin/mkimage -$(HOST_DIR)/bin/mkimage: $(DL_DIR)/$(HOST_U-BOOT_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_U-BOOT_DIR) - $(UNTAR)/$(HOST_U-BOOT_SOURCE) - $(CHDIR)/$(HOST_U-BOOT_DIR); \ +host-u-boot: $(DL_DIR)/$(HOST_U_BOOT_SOURCE) | $(HOST_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(MAKE) defconfig; \ $(MAKE) silentoldconfig; \ $(MAKE) tools-only - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_U-BOOT_DIR)/tools/mkimage $(HOST_DIR)/bin/ - $(REMOVE)/$(HOST_U-BOOT_DIR) + $(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/tools/mkimage $(HOST_MKIMAGE) + $(REMOVE)/$(PKG_DIR) + $(TOUCH) # ----------------------------------------------------------------------------- -HOST_TZCODE_VER = 2020d -HOST_TZCODE_DIR = tzcode$(HOST_TZCODE_VER) -HOST_TZCODE_SOURCE = tzcode$(HOST_TZCODE_VER).tar.gz -HOST_TZCODE_SITE = ftp://ftp.iana.org/tz/releases - -$(DL_DIR)/$(HOST_TZCODE_SOURCE): - $(DOWNLOAD) $(HOST_TZCODE_SITE)/$(HOST_TZCODE_SOURCE) - -HOST_TZDATA_VER = $(TZDATA_VER) -HOST_TZDATA_DIR = tzdata$(HOST_TZDATA_VER) -HOST_TZDATA_SOURCE = tzdata$(HOST_TZDATA_VER).tar.gz -HOST_TZDATA_SITE = ftp://ftp.iana.org/tz/releases +HOST_ZIC_VER = 2020f +HOST_ZIC_DIR = tzcode$(HOST_ZIC_VER) +HOST_ZIC_SOURCE = tzcode$(HOST_ZIC_VER).tar.gz +HOST_ZIC_SITE = ftp://ftp.iana.org/tz/releases -#$(DL_DIR)/$(HOST_TZDATA_SOURCE): -# $(DOWNLOAD) $(HOST_TZDATA_SITE)/$(HOST_TZDATA_SOURCE) +$(DL_DIR)/$(HOST_ZIC_SOURCE): + $(DOWNLOAD) $(HOST_ZIC_SITE)/$(HOST_ZIC_SOURCE) HOST_ZIC = $(HOST_DIR)/sbin/zic -host-zic: $(HOST_ZIC) -$(HOST_ZIC): $(DL_DIR)/$(HOST_TZDATA_SOURCE) $(DL_DIR)/$(HOST_TZCODE_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_TZCODE_DIR) - $(MKDIR)/$(HOST_TZCODE_DIR) - $(CHDIR)/$(HOST_TZCODE_DIR); \ - tar -xf $(DL_DIR)/$(HOST_TZCODE_SOURCE); \ - tar -xf $(DL_DIR)/$(HOST_TZDATA_SOURCE); \ +host-zic: $(DL_DIR)/$(HOST_ZIC_SOURCE) | $(HOST_DIR) + $(REMOVE)/$(PKG_DIR) + $(MKDIR)/$(PKG_DIR) + $(CHDIR)/$(PKG_DIR); \ + tar -xf $(DL_DIR)/$(PKG_SOURCE); \ + $(APPLY_PATCHES); \ $(MAKE) zic - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_TZCODE_DIR)/zic $(HOST_ZIC) - $(REMOVE)/$(HOST_TZCODE_DIR) + $(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/zic $(HOST_ZIC) + $(REMOVE)/$(PKG_DIR) + $(TOUCH) # ----------------------------------------------------------------------------- @@ -159,25 +157,23 @@ HOST_PARTED_SITE = $(GNU_MIRROR)/parted #$(DL_DIR)/$(HOST_PARTED_SOURCE): # $(DOWNLOAD) $(HOST_PARTED_SITE)/$(HOST_PARTED_SOURCE) -HOST_PARTED_PATCH = parted-device-mapper.patch -HOST_PARTED_PATCH += parted-sysmacros.patch +HOST_PARTED_CONF_OPTS = \ + --prefix= \ + --enable-silent-rules \ + --enable-static \ + --disable-shared \ + --disable-device-mapper \ + --without-readline host-parted: $(DL_DIR)/$(HOST_PARTED_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_PARTED_DIR) - $(UNTAR)/$(HOST_PARTED_SOURCE) - $(CHDIR)/$(HOST_PARTED_DIR); \ - $(call apply_patches,$(HOST_PARTED_PATCH)); \ - ./configure \ - --prefix= \ - --enable-silent-rules \ - --enable-static \ - --disable-shared \ - --disable-device-mapper \ - --without-readline \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ $(MAKE) install DESTDIR=$(HOST_DIR) - $(REMOVE)/$(HOST_PARTED_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -190,20 +186,21 @@ HOST_DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/downl #$(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE): # $(DOWNLOAD) $(HOST_DOSFSTOOLS_SITE)/$(HOST_DOSFSTOOLS_SOURCE) +HOST_DOSFSTOOLS_CONF_OPTS = \ + --prefix= \ + --without-udev + host-dosfstools: $(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_DOSFSTOOLS_DIR) - $(UNTAR)/$(HOST_DOSFSTOOLS_SOURCE) - $(CHDIR)/$(HOST_DOSFSTOOLS_DIR); \ - ./configure \ - --prefix= \ - --without-udev \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ $(MAKE) install DESTDIR=$(HOST_DIR) ln -sf mkfs.fat $(HOST_DIR)/sbin/mkfs.vfat ln -sf mkfs.fat $(HOST_DIR)/sbin/mkfs.msdos ln -sf mkfs.fat $(HOST_DIR)/sbin/mkdosfs - $(REMOVE)/$(HOST_DOSFSTOOLS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -216,16 +213,17 @@ HOST_MTOOLS_SITE = $(GNU_MIRROR)/mtools $(DL_DIR)/$(HOST_MTOOLS_SOURCE): $(DOWNLOAD) $(HOST_MTOOLS_SITE)/$(HOST_MTOOLS_SOURCE) +HOST_MTOOLS_CONF_OPTS = \ + --prefix= + host-mtools: $(DL_DIR)/$(HOST_MTOOLS_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_MTOOLS_DIR) - $(UNTAR)/$(HOST_MTOOLS_SOURCE) - $(CHDIR)/$(HOST_MTOOLS_DIR); \ - ./configure \ - --prefix= \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \ $(MAKE1); \ $(MAKE1) install DESTDIR=$(HOST_DIR) - $(REMOVE)/$(HOST_MTOOLS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -238,16 +236,17 @@ HOST_E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fspro #$(DL_DIR)/$(HOST_E2FSPROGS_SOURCE): # $(DOWNLOAD) $(HOST_E2FSPROGS_SITE)/$(HOST_E2FSPROGS_SOURCE) -host-e2fsprocs: $(DL_DIR)/$(HOST_E2FSPROGS_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_E2FSPROGS_DIR) - $(UNTAR)/$(HOST_E2FSPROGS_SOURCE) - $(CHDIR)/$(HOST_E2FSPROGS_DIR); \ - ./configure \ - --prefix= \ - ; \ +HOST_E2FSPROGS_CONF_OPTS = \ + --prefix= + +host-e2fsprogs: $(DL_DIR)/$(HOST_E2FSPROGS_SOURCE) | $(HOST_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ $(MAKE) install DESTDIR=$(HOST_DIR) - $(REMOVE)/$(HOST_E2FSPROGS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -260,7 +259,7 @@ HOST_MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(HOST $(DL_DIR)/$(HOST_MESON_SOURCE): $(DOWNLOAD) $(HOST_MESON_SITE)/$(HOST_MESON_SOURCE) -HOST_MESON_DEPS = host-ninja host-python3 host-python3-setuptools +HOST_MESON_DEPS = host-ninja host-python3 host-python3-setuptools HOST_MESON = $(HOST_DIR)/bin/meson @@ -284,19 +283,20 @@ HOST_NINJA_SITE = $(call github,ninja-build,ninja,v$(HOST_NINJA_VER)) $(DL_DIR)/$(HOST_NINJA_SOURCE): $(DOWNLOAD) $(HOST_NINJA_SITE)/$(HOST_NINJA_SOURCE) +HOST_NINJA_CONF_OPTS = \ + -DCMAKE_INSTALL_PREFIX="" + HOST_NINJA = $(HOST_DIR)/bin/ninja host-ninja: $(DL_DIR)/$(HOST_NINJA_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_NINJA_DIR) - $(UNTAR)/$(HOST_NINJA_SOURCE) - $(CHDIR)/$(HOST_NINJA_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - cmake . \ - -DCMAKE_INSTALL_PREFIX="" \ - ; \ + $($(PKG)_CONF_ENV) cmake $($(PKG)_CONF_OPTS); \ $(MAKE) - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_NINJA_DIR)/ninja $(HOST_NINJA) - $(REMOVE)/$(HOST_NINJA_DIR) + $(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/ninja $(HOST_NINJA) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -309,14 +309,15 @@ HOST_EXPAT_SITE = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_V #$(DL_DIR)/$(HOST_EXPAT_SOURCE): # $(DOWNLOAD) $(HOST_EXPAT_SITE)/$(EXPAT_SOURCE) +HOST_EXPAT_CONF_OPTS = \ + --prefix= \ + --without-docbook + host-expat: $(DL_DIR)/$(HOST_EXPAT_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_EXPAT_DIR) $(UNTAR)/$(HOST_EXPAT_SOURCE) $(CHDIR)/$(HOST_EXPAT_DIR); \ - ./configure \ - --prefix= \ - --without-docbook \ - ; \ + $($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ $(MAKE) install DESTDIR=$(HOST_DIR) $(REMOVE)/$(HOST_EXPAT_DIR) @@ -335,56 +336,59 @@ HOST_PYTHON3_INCLUDE_DIR = include/python$(basename $(HOST_PYTHON3_VER)) $(DL_DIR)/$(HOST_PYTHON3_SOURCE): $(DOWNLOAD) $(HOST_PYTHON3_SITE)/$(HOST_PYTHON3_SOURCE) -HOST_PYTHON3_DEPS = host-expat host-libffi +HOST_PYTHON3_DEPS = host-expat host-libffi + +HOST_PYTHON3_CONF_ENV = \ + CONFIG_SITE= \ + OPT="$(HOST_CFLAGS)" + +HOST_PYTHON3_CONF_OPTS = \ + --prefix=$(HOST_DIR) \ + --without-ensurepip \ + --without-cxx-main \ + --disable-sqlite3 \ + --disable-tk \ + --with-expat=system \ + --disable-curses \ + --disable-codecs-cjk \ + --disable-nis \ + --enable-unicodedata \ + --disable-test-modules \ + --disable-idle3 \ + --disable-ossaudiodev host-python3: $(HOST_PYTHON3_DEPS) $(DL_DIR)/$(HOST_PYTHON3_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_PYTHON3_DIR) - $(UNTAR)/$(HOST_PYTHON3_SOURCE) - $(CHDIR)/$(HOST_PYTHON3_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ #$(APPLY_PATCHES); \ autoconf; \ - CONFIG_SITE= \ - OPT="$(HOST_CFLAGS)" \ - ./configure \ - --prefix=$(HOST_DIR) \ - --without-ensurepip \ - --without-cxx-main \ - --disable-sqlite3 \ - --disable-tk \ - --with-expat=system \ - --disable-curses \ - --disable-codecs-cjk \ - --disable-nis \ - --enable-unicodedata \ - --disable-test-modules \ - --disable-idle3 \ - --disable-ossaudiodev \ - ; \ + $($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ $(MAKE) install - $(REMOVE)/$(HOST_PYTHON3_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -HOST_PYTHON3-SETUPTOOLS_VER = 44.0.0 -HOST_PYTHON3-SETUPTOOLS_DIR = setuptools-$(HOST_PYTHON3-SETUPTOOLS_VER) -HOST_PYTHON3-SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON3-SETUPTOOLS_VER).zip -HOST_PYTHON3-SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 +HOST_PYTHON3_SETUPTOOLS_VER = 44.0.0 +HOST_PYTHON3_SETUPTOOLS_DIR = setuptools-$(HOST_PYTHON3_SETUPTOOLS_VER) +HOST_PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON3_SETUPTOOLS_VER).zip +HOST_PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 -$(DL_DIR)/$(HOST_PYTHON3-SETUPTOOLS_SOURCE): - $(DOWNLOAD) $(HOST_PYTHON3-SETUPTOOLS_SITE)/$(HOST_PYTHON3-SETUPTOOLS_SOURCE) +$(DL_DIR)/$(HOST_PYTHON3_SETUPTOOLS_SOURCE): + $(DOWNLOAD) $(HOST_PYTHON3_SETUPTOOLS_SITE)/$(HOST_PYTHON3_SETUPTOOLS_SOURCE) -HOST_PYTHON3-SETUPTOOLS_DEPS = host-python3 +HOST_PYTHON3_SETUPTOOLS_DEPS = host-python3 -host-python3-setuptools: $(HOST_PYTHON3-SETUPTOOLS_DEPS) $(DL_DIR)/$(HOST_PYTHON3-SETUPTOOLS_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_PYTHON3-SETUPTOOLS_DIR) - $(UNZIP)/$(HOST_PYTHON3-SETUPTOOLS_SOURCE) - $(CHDIR)/$(HOST_PYTHON3-SETUPTOOLS_DIR); \ +host-python3-setuptools: $(HOST_PYTHON3_SETUPTOOLS_DEPS) $(DL_DIR)/$(HOST_PYTHON3_SETUPTOOLS_SOURCE) | $(HOST_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNZIP)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ $(HOST_PYTHON_BUILD); \ $(HOST_PYTHON_INSTALL) - $(REMOVE)/$(HOST_PYTHON3-SETUPTOOLS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -397,17 +401,18 @@ HOST_LIBFFI_SITE = https://github.com/libffi/libffi/releases/download/v$(HOST_ #$(DL_DIR)/$(HOST_LIBFFI_SOURCE): # $(DOWNLOAD) $(HOST_LIBFFI_SITE)/$(HOST_LIBFFI_SOURCE) +HOST_LIBFFI_CONF_OPTS = \ + --prefix= + host-libffi: $(DL_DIR)/$(HOST_LIBFFI_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_LIBFFI_DIR) - $(UNTAR)/$(HOST_LIBFFI_SOURCE) - $(CHDIR)/$(HOST_LIBFFI_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - ./configure \ - --prefix= \ - ; \ + $($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ $(MAKE) install DESTDIR=$(HOST_DIR) - $(REMOVE)/$(HOST_LIBFFI_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -426,13 +431,13 @@ HOST_LUA_PATCH += lua-01-remove-readline.patch HOST_LUA = $(HOST_DIR)/bin/lua host-lua: $(DL_DIR)/$(HOST_LUA_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_LUA_DIR) - $(UNTAR)/$(HOST_LUA_SOURCE) - $(CHDIR)/$(HOST_LUA_DIR); \ - $(call apply_patches,$(HOST_LUA_PATCH)); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(call apply_patches,$(addprefix $(PKG_PATCHES_DIR)/,$(PKG_PATCH))); \ $(MAKE) linux; \ - $(MAKE) install INSTALL_TOP=$(HOST_DIR) - $(REMOVE)/$(HOST_LUA_DIR) + $(MAKE) install INSTALL_TOP=$(HOST_DIR) INSTALL_MAN=$(HOST_DIR)/share/man/man1 + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -445,9 +450,9 @@ HOST_LUAROCKS_SITE = https://luarocks.github.io/luarocks/releases $(DL_DIR)/$(HOST_LUAROCKS_SOURCE): $(DOWNLOAD) $(HOST_LUAROCKS_SITE)/$(HOST_LUAROCKS_SOURCE) -HOST_LUAROCKS_PATCH = luarocks-0001-allow-libluajit-detection.patch +HOST_LUAROCKS_DEPS = host-lua -HOST_LUAROCKS_CONFIG_FILE = $(HOST_DIR)/etc/luarocks/config-$(LUA_ABIVER).lua +HOST_LUAROCKS_CONFIG = $(HOST_DIR)/etc/luarocks/config-$(LUA_ABIVER).lua HOST_LUAROCKS_MAKE_ENV = \ LUA_PATH="$(HOST_DIR)/share/lua/$(LUA_ABIVER)/?.lua" \ @@ -459,25 +464,26 @@ HOST_LUAROCKS_MAKE_ENV = \ TARGET_includedir="$(TARGET_includedir)" \ TARGET_libdir="$(TARGET_libdir)" +HOST_LUAROCKS_CONF_OPTS = \ + --prefix=$(HOST_DIR) \ + --sysconfdir=$(HOST_DIR)/etc \ + --with-lua=$(HOST_DIR) \ + --rocks-tree=$(TARGET_DIR) + HOST_LUAROCKS = $(HOST_DIR)/bin/luarocks -host-luarocks: $(HOST_LUAROCKS) -$(HOST_LUAROCKS): $(HOST_LUA) $(DL_DIR)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_LUAROCKS_DIR) - $(UNTAR)/$(HOST_LUAROCKS_SOURCE) - $(CHDIR)/$(HOST_LUAROCKS_DIR); \ - $(call apply_patches,$(HOST_LUAROCKS_PATCH)); \ - ./configure $(SILENT_OPT) \ - --prefix=$(HOST_DIR) \ - --sysconfdir=$(HOST_DIR)/etc \ - --with-lua=$(HOST_DIR) \ - --rocks-tree=$(TARGET_DIR) \ - ; \ - rm -f $(HOST_LUAROCKS_CONFIG_FILE); \ +host-luarocks: $(HOST_LUAROCKS_DEPS) $(DL_DIR)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS); \ + rm -f $(PKG_CONFIG_FILE); \ $(MAKE); \ $(MAKE) install - cat $(CONFIGS)/luarocks-config.lua >> $(HOST_LUAROCKS_CONFIG_FILE) - $(REMOVE)/$(HOST_LUAROCKS_DIR) + cat $(PKG_FILES_DIR)/luarocks-config.lua >> $(HOST_LUAROCKS_CONFIG) + $(REMOVE)/$(PKG_DIR) + $(TOUCH) # ----------------------------------------------------------------------------- diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk index 1ea271dc..42578ddc 100644 --- a/make/linux-drivers.mk +++ b/make/linux-drivers.mk @@ -13,7 +13,7 @@ rtl8192eu: kernel-$(BOXTYPE) | $(TARGET_DIR) $(GET-GIT-SOURCE) $(RTL8192EU_SITE) $(DL_DIR)/$(RTL8192EU_SOURCE) $(CPDIR)/$(RTL8192EU_SOURCE) $(CHDIR)/$(RTL8192EU_DIR); \ - $(MAKE) $(KERNEL_MAKEVARS); \ + $(MAKE) $(KERNEL_MAKE_VARS); \ $(INSTALL_DATA) 8192eu.ko $(TARGET_modulesdir)/kernel/drivers/net/wireless/ make depmod $(REMOVE)/$(RTL8192EU_DIR) @@ -34,7 +34,7 @@ rtl8812au: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8812AU_SOURCE) | $(TARGET_DIR) $(UNZIP)/$(RTL8812AU_SOURCE) $(CHDIR)/$(RTL8812AU_DIR); \ $(APPLY_PATCHES); \ - $(MAKE) $(KERNEL_MAKEVARS); \ + $(MAKE) $(KERNEL_MAKE_VARS); \ $(INSTALL_DATA) 8812au.ko $(TARGET_modulesdir)/kernel/drivers/net/wireless/ make depmod $(REMOVE)/$(RTL8812AU_DIR) @@ -55,7 +55,7 @@ rtl8822bu: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8822BU_SOURCE) | $(TARGET_DIR) $(UNZIP)/$(RTL8822BU_SOURCE) $(CHDIR)/$(RTL8822BU_DIR); \ $(APPLY_PATCHES); \ - $(MAKE) $(KERNEL_MAKEVARS); \ + $(MAKE) $(KERNEL_MAKE_VARS); \ $(INSTALL_DATA) 88x2bu.ko $(TARGET_modulesdir)/kernel/drivers/net/wireless/ make depmod $(REMOVE)/$(RTL8822BU_DIR) @@ -63,18 +63,16 @@ rtl8822bu: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8822BU_SOURCE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- -HD6x-MALI-DRIVERS_VER = DX910-SW-99002-r7p0-00rel0 -HD6x-MALI-DRIVERS_DIR = $(HD6x-MALI-DRIVERS_VER) -HD6x-MALI-DRIVERS_SOURCE = $(HD6x-MALI-DRIVERS_VER).tgz -HD6x-MALI-DRIVERS_SITE = https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu +HD6x_MALI_DRIVERS_VER = DX910-SW-99002-r7p0-00rel0 +HD6x_MALI_DRIVERS_DIR = $(HD6x_MALI_DRIVERS_VER) +HD6x_MALI_DRIVERS_SOURCE = $(HD6x_MALI_DRIVERS_VER).tgz +HD6x_MALI_DRIVERS_SITE = https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu -$(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE): - $(DOWNLOAD) $(HD6x-MALI-DRIVERS_SITE)/$(HD6x-MALI-DRIVERS_SOURCE) +$(DL_DIR)/$(HD6x_MALI_DRIVERS_SOURCE): + $(DOWNLOAD) $(HD6x_MALI_DRIVERS_SITE)/$(HD6x_MALI_DRIVERS_SOURCE) -HD6x-MALI-DRIVERS_PATCH = hi3798mv200-support.patch - -HD6x-MALI-DRIVERS_MAKEVARS = \ - M=$(BUILD_DIR)/$(HD6x-MALI-DRIVERS_DIR)/driver/src/devicedrv/mali \ +HD6x_MALI_DRIVERS_MAKE_VARS = \ + M=$(BUILD_DIR)/$(HD6x_MALI_DRIVERS_DIR)/driver/src/devicedrv/mali \ EXTRA_CFLAGS="-DCONFIG_MALI_DVFS=y -DCONFIG_GPU_AVS_ENABLE=y" \ CONFIG_MALI_SHARED_INTERRUPTS=y \ CONFIG_MALI400=m \ @@ -82,14 +80,14 @@ HD6x-MALI-DRIVERS_MAKEVARS = \ CONFIG_MALI_DVFS=y \ CONFIG_GPU_AVS_ENABLE=y -hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE) | $(TARGET_DIR) +hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(DL_DIR)/$(HD6x_MALI_DRIVERS_SOURCE) | $(TARGET_DIR) $(START_BUILD) - $(REMOVE)/$(HD6x-MALI-DRIVERS_DIR) - $(UNTAR)/$(HD6x-MALI-DRIVERS_SOURCE) - $(CHDIR)/$(HD6x-MALI-DRIVERS_DIR); \ - $(call apply_patches,$(HD6x-MALI-DRIVERS_PATCH)); \ - $(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS); \ - $(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install + $(REMOVE)/$(HD6x_MALI_DRIVERS_DIR) + $(UNTAR)/$(HD6x_MALI_DRIVERS_SOURCE) + $(CHDIR)/$(HD6x_MALI_DRIVERS_DIR); \ + $(APPLY_PATCHES); \ + $(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKE_VARS) $(HD6x_MALI_DRIVERS_MAKE_VARS); \ + $(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKE_VARS) $(HD6x_MALI_DRIVERS_MAKE_VARS) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install make depmod - $(REMOVE)/$(HD6x-MALI-DRIVERS_DIR) + $(REMOVE)/$(HD6x_MALI_DRIVERS_DIR) $(TOUCH) diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index f5c07bb3..8b4a8abe 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -193,17 +193,17 @@ VUDUO_PATCH = \ $(DL_DIR)/$(KERNEL_SOURCE): $(DOWNLOAD) $(KERNEL_SITE)/$(KERNEL_SOURCE) -$(DL_DIR)/$(VMLINUZ-INITRD_SOURCE): - $(DOWNLOAD) $(VMLINUZ-INITRD_SITE)/$(VMLINUZ-INITRD_SOURCE) +$(DL_DIR)/$(VMLINUZ_INITRD_SOURCE): + $(DOWNLOAD) $(VMLINUZ_INITRD_SITE)/$(VMLINUZ_INITRD_SOURCE) # ----------------------------------------------------------------------------- -kernel.do_checkout: $(SOURCE_DIR)/$(NI-LINUX-KERNEL) - $(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); \ +kernel.do_checkout: $(SOURCE_DIR)/$(NI_LINUX_KERNEL) + $(CD) $(SOURCE_DIR)/$(NI_LINUX_KERNEL); \ git checkout $(KERNEL_BRANCH) kernel.do_prepare: - $(MAKE) kernel.do_prepare.$(if $(filter $(KERNEL_SOURCE),git),git,tar) + $(MAKE) kernel.do_prepare_$(if $(filter $(KERNEL_SOURCE),git),git,tar) # $(REMOVE)/$(KERNEL_OBJ) $(REMOVE)/$(KERNEL_MODULES) @@ -213,31 +213,31 @@ kernel.do_prepare: $(MKDIR)/$(KERNEL_HEADERS) $(INSTALL_DATA) $(KERNEL_CONFIG) $(BUILD_DIR)/$(KERNEL_OBJ)/.config ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61)) - $(INSTALL_DATA) $(PATCHES)/initramfs-subdirboot.cpio.gz $(BUILD_DIR)/$(KERNEL_OBJ) + $(INSTALL_DATA) $(PKG_FILES_DIR)/initramfs-subdirboot.cpio.gz $(BUILD_DIR)/$(KERNEL_OBJ) endif $(TOUCH) -kernel.do_prepare.git: +kernel.do_prepare_git: $(MAKE) kernel.do_checkout # $(REMOVE)/$(KERNEL_DIR) - tar -C $(SOURCE_DIR) -cp $(NI-LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_DIR) -x + tar -C $(SOURCE_DIR) -cp $(NI_LINUX_KERNEL) --exclude-vcs | tar -C $(BUILD_DIR) -x $(CD) $(BUILD_DIR); \ - mv $(NI-LINUX-KERNEL) $(KERNEL_DIR) + mv $(NI_LINUX_KERNEL) $(KERNEL_DIR) -kernel.do_prepare.tar: $(DL_DIR)/$(KERNEL_SOURCE) +kernel.do_prepare_tar: $(DL_DIR)/$(KERNEL_SOURCE) $(REMOVE)/$(KERNEL_DIR) $(UNTAR)/$(KERNEL_SOURCE) $(CHDIR)/$(KERNEL_DIR); \ - $(call apply_patches,$(addprefix kernel/,$(KERNEL_PATCH))) + $(call apply_patches,$(addprefix $(PKG_PATCHES_DIR)/,$(KERNEL_PATCH))) kernel.do_compile: kernel.do_prepare $(CHDIR)/$(KERNEL_DIR); \ - $(MAKE) $(KERNEL_MAKEVARS) silentoldconfig; \ - $(MAKE) $(KERNEL_MAKEVARS) $(KERNEL_MAKEOPTS); \ - $(MAKE) $(KERNEL_MAKEVARS) modules_install; \ - $(MAKE) $(KERNEL_MAKEVARS) headers_install -ifneq ($(KERNEL_DTB),$(EMPTY)) + $(MAKE) $(KERNEL_MAKE_VARS) silentoldconfig; \ + $(MAKE) $(KERNEL_MAKE_VARS) modules $(KERNEL_MAKE_TARGETS); \ + $(MAKE) $(KERNEL_MAKE_VARS) modules_install; \ + $(MAKE) $(KERNEL_MAKE_VARS) headers_install +ifneq ($(KERNEL_DTB),$(empty)) cat $(KERNEL_ZIMAGE) $(KERNEL_DTB) > $(KERNEL_ZIMAGE_DTB) endif $(TOUCH) @@ -253,12 +253,12 @@ kernel-coolstream: kernel-coolstream-$(BOXSERIES) $(TOUCH) kernel-coolstream-hd1: kernel.do_compile | $(IMAGE_DIR) - mkimage -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_UIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img - mkimage -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img + $(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_UIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img + $(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img $(TOUCH) kernel-coolstream-hd2: kernel.do_compile | $(IMAGE_DIR) - mkimage -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz + $(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner)) ifeq ($(BOXMODEL),apollo) # create also shiner-kernel when building apollo @@ -271,7 +271,7 @@ endif $(TOUCH) kernel-armbox: kernel.do_compile | $(IMAGE_DIR) -#ifneq ($(KERNEL_DTB),$(EMPTY)) +#ifneq ($(KERNEL_DTB),$(empty)) # $(INSTALL_DATA) $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL).bin #else # $(INSTALL_DATA) $(KERNEL_ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL).bin @@ -287,21 +287,21 @@ kernel-mipsbox: kernel.do_compile | $(IMAGE_DIR) kernel-modules-coolstream: kernel-modules-coolstream-$(BOXSERIES) $(TOUCH) -STRIP-MODULES-COOLSTREAM-HD1 = -STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/mtd/devices/mtdram.ko -STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/mtd/devices/block2mtd.ko -STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/net/tun.ko -STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/staging/rt2870/rt2870sta.ko -STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/usb/serial/ftdi_sio.ko -STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/usb/serial/pl2303.ko -STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/usb/serial/usbserial.ko -STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/autofs4/autofs4.ko -STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/cifs/cifs.ko -STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/fuse/fuse.ko +STRIP_MODULES_COOLSTREAM_HD1 = +STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/mtd/devices/mtdram.ko +STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/mtd/devices/block2mtd.ko +STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/net/tun.ko +STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/staging/rt2870/rt2870sta.ko +STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/usb/serial/ftdi_sio.ko +STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/usb/serial/pl2303.ko +STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/usb/serial/usbserial.ko +STRIP_MODULES_COOLSTREAM_HD1 += kernel/fs/autofs4/autofs4.ko +STRIP_MODULES_COOLSTREAM_HD1 += kernel/fs/cifs/cifs.ko +STRIP_MODULES_COOLSTREAM_HD1 += kernel/fs/fuse/fuse.ko kernel-modules-coolstream-hd1: kernel-coolstream mkdir -p $(TARGET_modulesdir) - for module in $(STRIP-MODULES-COOLSTREAM-HD1); do \ + for module in $(STRIP_MODULES_COOLSTREAM_HD1); do \ mkdir -p $(TARGET_modulesdir)/$$(dirname $$module); \ $(TARGET_OBJCOPY) --strip-unneeded $(KERNEL_modulesdir)/$$module $(TARGET_modulesdir)/$$module; \ done; @@ -344,8 +344,8 @@ kernel-modules-mipsbox: kernel-mipsbox # ----------------------------------------------------------------------------- -vmlinuz-initrd: $(DL_DIR)/$(VMLINUZ-INITRD_SOURCE) - $(UNTAR)/$(VMLINUZ-INITRD_SOURCE) +vmlinuz-initrd: $(DL_DIR)/$(VMLINUZ_INITRD_SOURCE) + $(UNTAR)/$(VMLINUZ_INITRD_SOURCE) $(TOUCH) # ----------------------------------------------------------------------------- @@ -366,11 +366,11 @@ kernel-install-coolstream: kernel-install-coolstream-$(BOXSERIES) kernel-install-coolstream-hd1: kernel-coolstream-hd1 $(INSTALL_DATA) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img \ - $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/zImage + $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/zImage kernel-install-coolstream-hd2: kernel-coolstream-hd2 $(INSTALL_DATA) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz \ - $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/vmlinux.ub.gz + $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/vmlinux.ub.gz kernel-install-coolstream-all: make clean BOXFAMILY=nevis @@ -396,8 +396,8 @@ kernel-install-coolstream-all: # make clean > /dev/null 2>&1 # - @echo -e "$(TERM_YELLOW)Align stb_update.data in $(SOURCE_DIR)/$(NI-DRIVERS-BIN)$(TERM_NORMAL)" - @echo -e "$(TERM_YELLOW)and commit your changes in $(SOURCE_DIR)/$(NI-DRIVERS-BIN)$(TERM_NORMAL)" + @echo -e "$(TERM_YELLOW)Align stb_update.data in $(SOURCE_DIR)/$(NI_DRIVERS_BIN)$(TERM_NORMAL)" + @echo -e "$(TERM_YELLOW)and commit your changes in $(SOURCE_DIR)/$(NI_DRIVERS_BIN)$(TERM_NORMAL)" # ----------------------------------------------------------------------------- diff --git a/make/ni.mk b/make/ni.mk index f2d5f189..abf48f29 100644 --- a/make/ni.mk +++ b/make/ni.mk @@ -3,7 +3,7 @@ # # ----------------------------------------------------------------------------- -BOXMODEL_IMAGE = $(EMPTY) +BOXMODEL_IMAGE = ifneq ($(DEBUG),yes) BOXMODEL_IMAGE += nevis endif @@ -35,29 +35,29 @@ ni-image: $(MAKE) tzdata $(MAKE) smartmontools $(MAKE) sg3_utils - $(MAKE) nfs-utils - $(MAKE) procps-ng $(MAKE) nano make hd-idle + $(MAKE) hdparm + $(MAKE) nfs-utils $(MAKE) e2fsprogs $(MAKE) ntfs-3g $(MAKE) exfat-utils - $(MAKE) vsftpd + $(MAKE) dosfstools + $(MAKE) mtd-utils make djmount $(MAKE) ushare $(MAKE) xupnpd make inadyn make samba + $(MAKE) vsftpd make dropbear - $(MAKE) hdparm $(MAKE) busybox $(MAKE) sysvinit $(MAKE) coreutils - $(MAKE) dosfstools + $(MAKE) procps-ng $(MAKE) wpa_supplicant - $(MAKE) mtd-utils $(MAKE) wget - #$(MAKE) streamripper + $(MAKE) streamripper ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) $(MAKE) less $(MAKE) parted diff --git a/make/target-blobs.mk b/make/target-blobs.mk index da829a27..7f9eb9b6 100644 --- a/make/target-blobs.mk +++ b/make/target-blobs.mk @@ -22,104 +22,104 @@ endif firmware: firmware-boxmodel firmware-wireless -firmware-boxmodel: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR) - $(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware/.,$(TARGET_base_libdir)/firmware) - $(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware-dvb/.,$(TARGET_base_libdir)/firmware) +firmware-boxmodel: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR) + $(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-firmware/.,$(TARGET_base_libdir)/firmware) + $(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-firmware-dvb/.,$(TARGET_base_libdir)/firmware) ifeq ($(BOXMODEL),nevis) - FIRMWARE-WIRELESS = rt2870.bin - FIRMWARE-WIRELESS += rt3070.bin - FIRMWARE-WIRELESS += rt3071.bin - FIRMWARE-WIRELESS += rtlwifi/rtl8192cufw.bin - FIRMWARE-WIRELESS += rtlwifi/rtl8712u.bin + FIRMWARE_WIRELESS = rt2870.bin + FIRMWARE_WIRELESS += rt3070.bin + FIRMWARE_WIRELESS += rt3071.bin + FIRMWARE_WIRELESS += rtlwifi/rtl8192cufw.bin + FIRMWARE_WIRELESS += rtlwifi/rtl8712u.bin else - FIRMWARE-WIRELESS = $(shell cd $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/general/firmware-wireless; find * -type f) + FIRMWARE_WIRELESS = $(shell cd $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/general/firmware-wireless; find * -type f) endif -firmware-wireless: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR) - for firmware in $(FIRMWARE-WIRELESS); do \ - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/general/firmware-wireless/$$firmware $(TARGET_base_libdir)/firmware/$$firmware; \ +firmware-wireless: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR) + for firmware in $(FIRMWARE_WIRELESS); do \ + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/general/firmware-wireless/$$firmware $(TARGET_base_libdir)/firmware/$$firmware; \ done # ----------------------------------------------------------------------------- -HD51-DRIVERS_VER = 20191120 -HD51-DRIVERS_SOURCE = hd51-drivers-$(KERNEL_VER)-$(HD51-DRIVERS_VER).zip -HD51-DRIVERS_SITE = http://source.mynonpublic.com/gfutures +HD51_DRIVERS_VER = 20191120 +HD51_DRIVERS_SOURCE = hd51-drivers-$(KERNEL_VER)-$(HD51_DRIVERS_VER).zip +HD51_DRIVERS_SITE = http://source.mynonpublic.com/gfutures -BRE2ZE4K-DRIVERS_VER = 20191120 -BRE2ZE4K-DRIVERS_SOURCE = bre2ze4k-drivers-$(KERNEL_VER)-$(BRE2ZE4K-DRIVERS_VER).zip -BRE2ZE4K-DRIVERS_SITE = http://source.mynonpublic.com/gfutures +BRE2ZE4K_DRIVERS_VER = 20191120 +BRE2ZE4K_DRIVERS_SOURCE = bre2ze4k-drivers-$(KERNEL_VER)-$(BRE2ZE4K_DRIVERS_VER).zip +BRE2ZE4K_DRIVERS_SITE = http://source.mynonpublic.com/gfutures -H7-DRIVERS_VER = 20191123 -H7-DRIVERS_SOURCE = h7-drivers-$(KERNEL_VER)-$(H7-DRIVERS_VER).zip -H7-DRIVERS_SITE = http://source.mynonpublic.com/zgemma +H7_DRIVERS_VER = 20191123 +H7_DRIVERS_SOURCE = h7-drivers-$(KERNEL_VER)-$(H7_DRIVERS_VER).zip +H7_DRIVERS_SITE = http://source.mynonpublic.com/zgemma -HD60-DRIVERS_VER = 20200731 -HD60-DRIVERS_SOURCE = hd60-drivers-$(KERNEL_VER)-$(HD60-DRIVERS_VER).zip -HD60-DRIVERS_SITE = http://source.mynonpublic.com/gfutures +HD60_DRIVERS_VER = 20200731 +HD60_DRIVERS_SOURCE = hd60-drivers-$(KERNEL_VER)-$(HD60_DRIVERS_VER).zip +HD60_DRIVERS_SITE = http://source.mynonpublic.com/gfutures -HD61-DRIVERS_VER = 20200731 -HD61-DRIVERS_SOURCE = hd61-drivers-$(KERNEL_VER)-$(HD61-DRIVERS_VER).zip -HD61-DRIVERS_SITE = http://source.mynonpublic.com/gfutures +HD61_DRIVERS_VER = 20200731 +HD61_DRIVERS_SOURCE = hd61-drivers-$(KERNEL_VER)-$(HD61_DRIVERS_VER).zip +HD61_DRIVERS_SITE = http://source.mynonpublic.com/gfutures -VUSOLO4K-DRIVERS_VER = 20190424 -VUSOLO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vusolo4k-3.14.28-$(VUSOLO4K-DRIVERS_VER).r0.tar.gz -VUSOLO4K-DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy +VUSOLO4K_DRIVERS_VER = 20190424 +VUSOLO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vusolo4k-3.14.28-$(VUSOLO4K_DRIVERS_VER).r0.tar.gz +VUSOLO4K_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy -ifeq ($(VUPLUS-DRIVERS_LATEST),yes) -VUDUO4K-DRIVERS_VER = 20191218 +ifeq ($(VUPLUS_DRIVERS_LATEST),yes) +VUDUO4K_DRIVERS_VER = 20191218 else -VUDUO4K-DRIVERS_VER = 20190212 +VUDUO4K_DRIVERS_VER = 20190212 endif -VUDUO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4k-4.1.45-$(VUDUO4K-DRIVERS_VER).r0.tar.gz -VUDUO4K-DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy +VUDUO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4k-4.1.45-$(VUDUO4K_DRIVERS_VER).r0.tar.gz +VUDUO4K_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy -VUDUO4KSE-DRIVERS_VER = 20200903 -VUDUO4KSE-DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4kse-4.1.45-$(VUDUO4KSE-DRIVERS_VER).r0.tar.gz -VUDUO4KSE-DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy +VUDUO4KSE_DRIVERS_VER = 20200903 +VUDUO4KSE_DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4kse-4.1.45-$(VUDUO4KSE_DRIVERS_VER).r0.tar.gz +VUDUO4KSE_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy -ifeq ($(VUPLUS-DRIVERS_LATEST),yes) -VUULTIMO4K-DRIVERS_VER = 20190424 +ifeq ($(VUPLUS_DRIVERS_LATEST),yes) +VUULTIMO4K_DRIVERS_VER = 20190424 else -VUULTIMO4K-DRIVERS_VER = 20190104 +VUULTIMO4K_DRIVERS_VER = 20190104 endif -VUULTIMO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vuultimo4k-3.14.28-$(VUULTIMO4K-DRIVERS_VER).r0.tar.gz -VUULTIMO4K-DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy +VUULTIMO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuultimo4k-3.14.28-$(VUULTIMO4K_DRIVERS_VER).r0.tar.gz +VUULTIMO4K_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy -VUZERO4K-DRIVERS_VER = 20190424 -VUZERO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vuzero4k-4.1.20-$(VUZERO4K-DRIVERS_VER).r0.tar.gz -VUZERO4K-DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy +VUZERO4K_DRIVERS_VER = 20190424 +VUZERO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuzero4k-4.1.20-$(VUZERO4K_DRIVERS_VER).r0.tar.gz +VUZERO4K_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy -ifeq ($(VUPLUS-DRIVERS_LATEST),yes) -VUUNO4K-DRIVERS_VER = 20190424 +ifeq ($(VUPLUS_DRIVERS_LATEST),yes) +VUUNO4K_DRIVERS_VER = 20190424 else -VUUNO4K-DRIVERS_VER = 20190104 +VUUNO4K_DRIVERS_VER = 20190104 endif -VUUNO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4k-3.14.28-$(VUUNO4K-DRIVERS_VER).r0.tar.gz -VUUNO4K-DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy +VUUNO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4k-3.14.28-$(VUUNO4K_DRIVERS_VER).r0.tar.gz +VUUNO4K_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy -ifeq ($(VUPLUS-DRIVERS_LATEST),yes) -VUUNO4KSE-DRIVERS_VER = 20190424 +ifeq ($(VUPLUS_DRIVERS_LATEST),yes) +VUUNO4KSE_DRIVERS_VER = 20190424 else -VUUNO4KSE-DRIVERS_VER = 20190104 +VUUNO4KSE_DRIVERS_VER = 20190104 endif -VUUNO4KSE-DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4kse-4.1.20-$(VUUNO4KSE-DRIVERS_VER).r0.tar.gz -VUUNO4KSE-DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy +VUUNO4KSE_DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4kse-4.1.20-$(VUUNO4KSE_DRIVERS_VER).r0.tar.gz +VUUNO4KSE_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy -VUDUO-DRIVERS_VER = 20151124 -VUDUO-DRIVERS_SOURCE = vuplus-dvb-modules-bm750-3.9.6-$(VUDUO-DRIVERS_VER).tar.gz -VUDUO-DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-modules +VUDUO_DRIVERS_VER = 20151124 +VUDUO_DRIVERS_SOURCE = vuplus-dvb-modules-bm750-3.9.6-$(VUDUO_DRIVERS_VER).tar.gz +VUDUO_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-modules # ----------------------------------------------------------------------------- -BOXMODEL-DRIVERS_VER = $($(call UPPERCASE,$(BOXMODEL))-DRIVERS_VER) -BOXMODEL-DRIVERS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-DRIVERS_SOURCE) -BOXMODEL-DRIVERS_SITE = $($(call UPPERCASE,$(BOXMODEL))-DRIVERS_SITE) +BOXMODEL_DRIVERS_VER = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_VER) +BOXMODEL_DRIVERS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_SOURCE) +BOXMODEL_DRIVERS_SITE = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_SITE) -ifneq ($(BOXMODEL-DRIVERS_SOURCE),$(EMPTY)) -$(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE): - $(DOWNLOAD) $(BOXMODEL-DRIVERS_SITE)/$(BOXMODEL-DRIVERS_SOURCE) +ifneq ($(BOXMODEL_DRIVERS_SOURCE),$(empty)) +$(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE): + $(DOWNLOAD) $(BOXMODEL_DRIVERS_SITE)/$(BOXMODEL_DRIVERS_SOURCE) endif nevis-drivers \ @@ -127,15 +127,15 @@ apollo-drivers \ shiner-drivers \ kronos-drivers \ kronos_v2-drivers \ -coolstream-drivers: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR) +coolstream-drivers: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR) mkdir -p $(TARGET_libdir) - $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib/. $(TARGET_libdir) - $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/libcoolstream/$(shell echo -n $(FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_libdir) + $(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib/. $(TARGET_libdir) + $(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/libcoolstream/$(shell echo -n $(FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_libdir) ifeq ($(BOXMODEL),nevis) ln -sf libnxp.so $(TARGET_libdir)/libconexant.so endif mkdir -p $(TARGET_modulesdir) - $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-modules/$(KERNEL_VER)/. $(TARGET_modulesdir) + $(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-modules/$(KERNEL_VER)/. $(TARGET_modulesdir) ifeq ($(BOXMODEL),nevis) ln -sf $(KERNEL_VER) $(TARGET_modulesdir)-$(BOXMODEL) endif @@ -144,16 +144,16 @@ endif hd51-drivers \ bre2ze4k-drivers \ -h7-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) +h7-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR) mkdir -p $(TARGET_modulesdir)/extra - unzip -o $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra + unzip -o $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra make depmod $(TOUCH) hd60-drivers \ -hd61-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) +hd61-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR) mkdir -p $(TARGET_modulesdir)/extra - unzip -o $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra + unzip -o $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra rm -f $(TARGET_modulesdir)/extra/hi_play.ko mv $(TARGET_modulesdir)/extra/turnoff_power $(TARGET_bindir) make depmod @@ -167,107 +167,107 @@ vuzero4k-drivers \ vuuno4k-drivers \ vuuno4kse-drivers \ vuduo-drivers \ -vuplus-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) +vuplus-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR) mkdir -p $(TARGET_modulesdir)/extra - tar -xf $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -C $(TARGET_modulesdir)/extra + tar -xf $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -C $(TARGET_modulesdir)/extra make depmod $(TOUCH) # ----------------------------------------------------------------------------- -HD51-LIBGLES_VER = 20191101 -HD51-LIBGLES_DIR = $(EMPTY) -HD51-LIBGLES_SOURCE = hd51-v3ddriver-$(HD51-LIBGLES_VER).zip -HD51-LIBGLES_SITE = http://downloads.mutant-digital.net/v3ddriver - -BRE2ZE4K-LIBGLES_VER = 20191101 -BRE2ZE4K-LIBGLES_DIR = $(EMPTY) -BRE2ZE4K-LIBGLES_SOURCE = bre2ze4k-v3ddriver-$(BRE2ZE4K-LIBGLES_VER).zip -BRE2ZE4K-LIBGLES_SITE = http://downloads.mutant-digital.net/v3ddriver - -H7-LIBGLES_VER = 20191110 -H7-LIBGLES_DIR = $(EMPTY) -H7-LIBGLES_SOURCE = h7-v3ddriver-$(H7-LIBGLES_VER).zip -H7-LIBGLES_SITE = http://source.mynonpublic.com/zgemma - -HD60-LIBGLES_VER = 20181201 -HD60-LIBGLES_DIR = $(EMPTY) -HD60-LIBGLES_SOURCE = hd60-mali-$(HD60-LIBGLES_VER).zip -HD60-LIBGLES_SITE = http://downloads.mutant-digital.net/hd60 - -HD61-LIBGLES_VER = 20181201 -HD61-LIBGLES_DIR = $(EMPTY) -HD61-LIBGLES_SOURCE = hd61-mali-$(HD61-LIBGLES_VER).zip -HD61-LIBGLES_SITE = http://downloads.mutant-digital.net/hd61 - -HD6x-LIBGLES-HEADERS_SOURCE = libgles-mali-utgard-headers.zip -HD6x-LIBGLES-HEADERS_SITE = https://github.com/HD-Digital/meta-gfutures/raw/release-6.2/recipes-bsp/mali/files - -VUSOLO4K-LIBGLES_VER = $(VUSOLO4K-DRIVERS_VER) -VUSOLO4K-LIBGLES_DIR = libgles-vusolo4k -VUSOLO4K-LIBGLES_SOURCE = libgles-vusolo4k-17.1-$(VUSOLO4K-LIBGLES_VER).r0.tar.gz -VUSOLO4K-LIBGLES_SITE = http://code.vuplus.com/download/release/libgles - -VUDUO4K-LIBGLES_VER = $(VUDUO4K-DRIVERS_VER) -VUDUO4K-LIBGLES_DIR = libgles-vuduo4k -VUDUO4K-LIBGLES_SOURCE = libgles-vuduo4k-18.1-$(VUDUO4K-LIBGLES_VER).r0.tar.gz -VUDUO4K-LIBGLES_SITE = http://code.vuplus.com/download/release/libgles - -VUDUO4KSE-LIBGLES_VER = $(VUDUO4KSE-DRIVERS_VER) -VUDUO4KSE-LIBGLES_DIR = libgles-vuduo4kse -VUDUO4KSE-LIBGLES_SOURCE = libgles-vuduo4kse-17.1-$(VUDUO4KSE-LIBGLES_VER).r0.tar.gz -VUDUO4KSE-LIBGLES_SITE = http://code.vuplus.com/download/release/libgles - -VUULTIMO4K-LIBGLES_VER = $(VUULTIMO4K-DRIVERS_VER) -VUULTIMO4K-LIBGLES_DIR = libgles-vuultimo4k -VUULTIMO4K-LIBGLES_SOURCE = libgles-vuultimo4k-17.1-$(VUULTIMO4K-LIBGLES_VER).r0.tar.gz -VUULTIMO4K-LIBGLES_SITE = http://code.vuplus.com/download/release/libgles - -VUZERO4K-LIBGLES_VER = $(VUZERO4K-DRIVERS_VER) -VUZERO4K-LIBGLES_DIR = libgles-vuzero4k -VUZERO4K-LIBGLES_SOURCE = libgles-vuzero4k-17.1-$(VUZERO4K-LIBGLES_VER).r0.tar.gz -VUZERO4K-LIBGLES_SITE = http://code.vuplus.com/download/release/libgles - -VUUNO4K-LIBGLES_VER = $(VUUNO4K-DRIVERS_VER) -VUUNO4K-LIBGLES_DIR = libgles-vuuno4k -VUUNO4K-LIBGLES_SOURCE = libgles-vuuno4k-17.1-$(VUUNO4K-LIBGLES_VER).r0.tar.gz -VUUNO4K-LIBGLES_SITE = http://code.vuplus.com/download/release/libgles - -VUUNO4KSE-LIBGLES_VER = $(VUUNO4KSE-DRIVERS_VER) -VUUNO4KSE-LIBGLES_DIR = libgles-vuuno4kse -VUUNO4KSE-LIBGLES_SOURCE = libgles-vuuno4kse-17.1-$(VUUNO4KSE-LIBGLES_VER).r0.tar.gz -VUUNO4KSE-LIBGLES_SITE = http://code.vuplus.com/download/release/libgles +HD51_LIBGLES_VER = 20191101 +HD51_LIBGLES_DIR = $(empty) +HD51_LIBGLES_SOURCE = hd51-v3ddriver-$(HD51_LIBGLES_VER).zip +HD51_LIBGLES_SITE = http://downloads.mutant-digital.net/v3ddriver + +BRE2ZE4K_LIBGLES_VER = 20191101 +BRE2ZE4K_LIBGLES_DIR = $(empty) +BRE2ZE4K_LIBGLES_SOURCE = bre2ze4k-v3ddriver-$(BRE2ZE4K_LIBGLES_VER).zip +BRE2ZE4K_LIBGLES_SITE = http://downloads.mutant-digital.net/v3ddriver + +H7_LIBGLES_VER = 20191110 +H7_LIBGLES_DIR = $(empty) +H7_LIBGLES_SOURCE = h7-v3ddriver-$(H7_LIBGLES_VER).zip +H7_LIBGLES_SITE = http://source.mynonpublic.com/zgemma + +HD60_LIBGLES_VER = 20181201 +HD60_LIBGLES_DIR = $(empty) +HD60_LIBGLES_SOURCE = hd60-mali-$(HD60_LIBGLES_VER).zip +HD60_LIBGLES_SITE = http://downloads.mutant-digital.net/hd60 + +HD61_LIBGLES_VER = 20181201 +HD61_LIBGLES_DIR = $(empty) +HD61_LIBGLES_SOURCE = hd61-mali-$(HD61_LIBGLES_VER).zip +HD61_LIBGLES_SITE = http://downloads.mutant-digital.net/hd61 + +HD6x_LIBGLES_HEADERS_SOURCE = libgles-mali-utgard-headers.zip +HD6x_LIBGLES_HEADERS_SITE = https://github.com/HD-Digital/meta-gfutures/raw/release-6.2/recipes-bsp/mali/files + +VUSOLO4K_LIBGLES_VER = $(VUSOLO4K_DRIVERS_VER) +VUSOLO4K_LIBGLES_DIR = libgles-vusolo4k +VUSOLO4K_LIBGLES_SOURCE = libgles-vusolo4k-17.1-$(VUSOLO4K_LIBGLES_VER).r0.tar.gz +VUSOLO4K_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles + +VUDUO4K_LIBGLES_VER = $(VUDUO4K_DRIVERS_VER) +VUDUO4K_LIBGLES_DIR = libgles-vuduo4k +VUDUO4K_LIBGLES_SOURCE = libgles-vuduo4k-18.1-$(VUDUO4K_LIBGLES_VER).r0.tar.gz +VUDUO4K_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles + +VUDUO4KSE_LIBGLES_VER = $(VUDUO4KSE_DRIVERS_VER) +VUDUO4KSE_LIBGLES_DIR = libgles-vuduo4kse +VUDUO4KSE_LIBGLES_SOURCE = libgles-vuduo4kse-17.1-$(VUDUO4KSE_LIBGLES_VER).r0.tar.gz +VUDUO4KSE_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles + +VUULTIMO4K_LIBGLES_VER = $(VUULTIMO4K_DRIVERS_VER) +VUULTIMO4K_LIBGLES_DIR = libgles-vuultimo4k +VUULTIMO4K_LIBGLES_SOURCE = libgles-vuultimo4k-17.1-$(VUULTIMO4K_LIBGLES_VER).r0.tar.gz +VUULTIMO4K_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles + +VUZERO4K_LIBGLES_VER = $(VUZERO4K_DRIVERS_VER) +VUZERO4K_LIBGLES_DIR = libgles-vuzero4k +VUZERO4K_LIBGLES_SOURCE = libgles-vuzero4k-17.1-$(VUZERO4K_LIBGLES_VER).r0.tar.gz +VUZERO4K_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles + +VUUNO4K_LIBGLES_VER = $(VUUNO4K_DRIVERS_VER) +VUUNO4K_LIBGLES_DIR = libgles-vuuno4k +VUUNO4K_LIBGLES_SOURCE = libgles-vuuno4k-17.1-$(VUUNO4K_LIBGLES_VER).r0.tar.gz +VUUNO4K_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles + +VUUNO4KSE_LIBGLES_VER = $(VUUNO4KSE_DRIVERS_VER) +VUUNO4KSE_LIBGLES_DIR = libgles-vuuno4kse +VUUNO4KSE_LIBGLES_SOURCE = libgles-vuuno4kse-17.1-$(VUUNO4KSE_LIBGLES_VER).r0.tar.gz +VUUNO4KSE_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles # ----------------------------------------------------------------------------- -BOXMODEL-LIBGLES_VER = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_VER) -BOXMODEL-LIBGLES_DIR = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_DIR) -BOXMODEL-LIBGLES_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_SOURCE) -BOXMODEL-LIBGLES_SITE = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_SITE) +BOXMODEL_LIBGLES_VER = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_VER) +BOXMODEL_LIBGLES_DIR = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_DIR) +BOXMODEL_LIBGLES_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_SOURCE) +BOXMODEL_LIBGLES_SITE = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_SITE) -ifneq ($(BOXMODEL-LIBGLES_SOURCE),$(EMPTY)) -$(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE): - $(DOWNLOAD) $(BOXMODEL-LIBGLES_SITE)/$(BOXMODEL-LIBGLES_SOURCE) +ifneq ($(BOXMODEL_LIBGLES_SOURCE),$(empty)) +$(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE): + $(DOWNLOAD) $(BOXMODEL_LIBGLES_SITE)/$(BOXMODEL_LIBGLES_SOURCE) endif hd51-libgles \ bre2ze4k-libgles \ -h7-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) - unzip -o $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_libdir) +h7-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR) + unzip -o $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) -d $(TARGET_libdir) ln -sf libv3ddriver.so $(TARGET_libdir)/libEGL.so ln -sf libv3ddriver.so $(TARGET_libdir)/libGLESv2.so $(TOUCH) -$(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE): - $(DOWNLOAD) $(HD6x-LIBGLES-HEADERS_SITE)/$(HD6x-LIBGLES-HEADERS_SOURCE) +$(DL_DIR)/$(HD6x_LIBGLES_HEADERS_SOURCE): + $(DOWNLOAD) $(HD6x_LIBGLES_HEADERS_SITE)/$(HD6x_LIBGLES_HEADERS_SOURCE) -hd6x-libgles-headers: $(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE) | $(TARGET_DIR) - unzip -o $(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE) -d $(TARGET_includedir) +hd6x-libgles-headers: $(DL_DIR)/$(HD6x_LIBGLES_HEADERS_SOURCE) | $(TARGET_DIR) + unzip -o $(DL_DIR)/$(HD6x_LIBGLES_HEADERS_SOURCE) -d $(TARGET_includedir) $(TOUCH) hd60-libgles \ -hd61-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) - unzip -o $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_libdir) +hd61-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR) + unzip -o $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) -d $(TARGET_libdir) $(CD) $(TARGET_libdir); \ ln -sf libMali.so libmali.so; \ ln -sf libMali.so libEGL.so.1.4; ln -sf libEGL.so.1.4 libEGL.so.1; ln -sf libEGL.so.1 libEGL.so; \ @@ -283,107 +283,107 @@ vuultimo4k-libgles \ vuzero4k-libgles \ vuuno4k-libgles \ vuuno4kse-libgles \ -vuplus-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BOXMODEL-LIBGLES_DIR) - $(UNTAR)/$(BOXMODEL-LIBGLES_SOURCE) - $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/lib/* $(TARGET_libdir) +vuplus-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(BOXMODEL_LIBGLES_DIR) + $(UNTAR)/$(BOXMODEL_LIBGLES_SOURCE) + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL_LIBGLES_DIR)/lib/* $(TARGET_libdir) ln -sf libv3ddriver.so $(TARGET_libdir)/libEGL.so ln -sf libv3ddriver.so $(TARGET_libdir)/libGLESv2.so - $(INSTALL_COPY) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/include/* $(TARGET_includedir) - $(REMOVE)/$(BOXMODEL-LIBGLES_DIR) + $(INSTALL_COPY) $(BUILD_DIR)/$(BOXMODEL_LIBGLES_DIR)/include/* $(TARGET_includedir) + $(REMOVE)/$(BOXMODEL_LIBGLES_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -HD60-LIBS_VER = 20200622 -HD60-LIBS_DIR = hiplay -HD60-LIBS_SOURCE = gfutures-libs-3798mv200-$(HD60-LIBS_VER).zip -HD60-LIBS_SITE = http://source.mynonpublic.com/gfutures +HD60_LIBS_VER = 20200622 +HD60_LIBS_DIR = hiplay +HD60_LIBS_SOURCE = gfutures-libs-3798mv200-$(HD60_LIBS_VER).zip +HD60_LIBS_SITE = http://source.mynonpublic.com/gfutures -HD61-LIBS_VER = 20200622 -HD61-LIBS_DIR = hiplay -HD61-LIBS_SOURCE = gfutures-libs-3798mv200-$(HD61-LIBS_VER).zip -HD61-LIBS_SITE = http://source.mynonpublic.com/gfutures +HD61_LIBS_VER = 20200622 +HD61_LIBS_DIR = hiplay +HD61_LIBS_SOURCE = gfutures-libs-3798mv200-$(HD61_LIBS_VER).zip +HD61_LIBS_SITE = http://source.mynonpublic.com/gfutures # ----------------------------------------------------------------------------- -BOXMODEL-LIBS_VER = $($(call UPPERCASE,$(BOXMODEL))-LIBS_VER) -BOXMODEL-LIBS_DIR = $($(call UPPERCASE,$(BOXMODEL))-LIBS_DIR) -BOXMODEL-LIBS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-LIBS_SOURCE) -BOXMODEL-LIBS_SITE = $($(call UPPERCASE,$(BOXMODEL))-LIBS_SITE) +BOXMODEL_LIBS_VER = $($(call UPPERCASE,$(BOXMODEL))_LIBS_VER) +BOXMODEL_LIBS_DIR = $($(call UPPERCASE,$(BOXMODEL))_LIBS_DIR) +BOXMODEL_LIBS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_LIBS_SOURCE) +BOXMODEL_LIBS_SITE = $($(call UPPERCASE,$(BOXMODEL))_LIBS_SITE) -ifneq ($(BOXMODEL-LIBS_SOURCE),$(EMPTY)) -$(DL_DIR)/$(BOXMODEL-LIBS_SOURCE): - $(DOWNLOAD) $(BOXMODEL-LIBS_SITE)/$(BOXMODEL-LIBS_SOURCE) +ifneq ($(BOXMODEL_LIBS_SOURCE),$(empty)) +$(DL_DIR)/$(BOXMODEL_LIBS_SOURCE): + $(DOWNLOAD) $(BOXMODEL_LIBS_SITE)/$(BOXMODEL_LIBS_SOURCE) endif hd60-libs \ -hd61-libs: $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BOXMODEL-LIBS_DIR) - unzip -o $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) -d $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR) +hd61-libs: $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(BOXMODEL_LIBS_DIR) + unzip -o $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE) -d $(BUILD_DIR)/$(BOXMODEL_LIBS_DIR) mkdir -p $(TARGET_libdir)/hisilicon - $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/hisilicon/* $(TARGET_libdir)/hisilicon - $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/ffmpeg/* $(TARGET_libdir)/hisilicon + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL_LIBS_DIR)/hisilicon/* $(TARGET_libdir)/hisilicon + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL_LIBS_DIR)/ffmpeg/* $(TARGET_libdir)/hisilicon ln -sf /lib/ld-linux-armhf.so.3 $(TARGET_libdir)/hisilicon/ld-linux.so - $(REMOVE)/$(BOXMODEL-LIBS_DIR) + $(REMOVE)/$(BOXMODEL_LIBS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -VUSOLO4K-PLATFORM-UTIL_VER = $(VUSOLO4K-DRIVERS_VER) -VUSOLO4K-PLATFORM-UTIL_DIR = platform-util-vusolo4k -VUSOLO4K-PLATFORM-UTIL_SOURCE = platform-util-vusolo4k-17.1-$(VUSOLO4K-PLATFORM-UTIL_VER).r0.tar.gz -VUSOLO4K-PLATFORM-UTIL_SITE = http://code.vuplus.com/download/release/platform-util - -VUDUO4K-PLATFORM-UTIL_VER = $(VUDUO4K-DRIVERS_VER) -VUDUO4K-PLATFORM-UTIL_DIR = platform-util-vuduo4k -VUDUO4K-PLATFORM-UTIL_SOURCE = platform-util-vuduo4k-18.1-$(VUDUO4K-PLATFORM-UTIL_VER).r0.tar.gz -VUDUO4K-PLATFORM-UTIL_SITE = http://code.vuplus.com/download/release/platform-util - -VUDUO4KSE-PLATFORM-UTIL_VER = $(VUDUO4KSE-DRIVERS_VER) -VUDUO4KSE-PLATFORM-UTIL_DIR = platform-util-vuduo4kse -VUDUO4KSE-PLATFORM-UTIL_SOURCE = platform-util-vuduo4kse-17.1-$(VUDUO4KSE-PLATFORM-UTIL_VER).r0.tar.gz -VUDUO4KSE-PLATFORM-UTIL_SITE = http://code.vuplus.com/download/release/platform-util - -VUULTIMO4K-PLATFORM-UTIL_VER = $(VUULTIMO4K-DRIVERS_VER) -VUULTIMO4K-PLATFORM-UTIL_DIR = platform-util-vuultimo4k -VUULTIMO4K-PLATFORM-UTIL_SOURCE = platform-util-vuultimo4k-17.1-$(VUULTIMO4K-PLATFORM-UTIL_VER).r0.tar.gz -VUULTIMO4K-PLATFORM-UTIL_SITE = http://code.vuplus.com/download/release/platform-util - -VUZERO4K-PLATFORM-UTIL_VER = $(VUZERO4K-DRIVERS_VER) -VUZERO4K-PLATFORM-UTIL_DIR = platform-util-vuzero4k -VUZERO4K-PLATFORM-UTIL_SOURCE = platform-util-vuzero4k-17.1-$(VUZERO4K-PLATFORM-UTIL_VER).r0.tar.gz -VUZERO4K-PLATFORM-UTIL_SITE = http://code.vuplus.com/download/release/platform-util - -VUUNO4K-PLATFORM-UTIL_VER = $(VUUNO4K-DRIVERS_VER) -VUUNO4K-PLATFORM-UTIL_DIR = platform-util-vuuno4k -VUUNO4K-PLATFORM-UTIL_SOURCE = platform-util-vuuno4k-17.1-$(VUUNO4K-PLATFORM-UTIL_VER).r0.tar.gz -VUUNO4K-PLATFORM-UTIL_SITE = http://code.vuplus.com/download/release/platform-util - -VUUNO4KSE-PLATFORM-UTIL_VER = $(VUUNO4KSE-DRIVERS_VER) -VUUNO4KSE-PLATFORM-UTIL_DIR = platform-util-vuuno4kse -VUUNO4KSE-PLATFORM-UTIL_SOURCE = platform-util-vuuno4kse-17.1-$(VUUNO4KSE-PLATFORM-UTIL_VER).r0.tar.gz -VUUNO4KSE-PLATFORM-UTIL_SITE = http://code.vuplus.com/download/release/platform-util +VUSOLO4K_PLATFORM_UTIL_VER = $(VUSOLO4K_DRIVERS_VER) +VUSOLO4K_PLATFORM_UTIL_DIR = platform-util-vusolo4k +VUSOLO4K_PLATFORM_UTIL_SOURCE = platform-util-vusolo4k-17.1-$(VUSOLO4K_PLATFORM_UTIL_VER).r0.tar.gz +VUSOLO4K_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util + +VUDUO4K_PLATFORM_UTIL_VER = $(VUDUO4K_DRIVERS_VER) +VUDUO4K_PLATFORM_UTIL_DIR = platform-util-vuduo4k +VUDUO4K_PLATFORM_UTIL_SOURCE = platform-util-vuduo4k-18.1-$(VUDUO4K_PLATFORM_UTIL_VER).r0.tar.gz +VUDUO4K_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util + +VUDUO4KSE_PLATFORM_UTIL_VER = $(VUDUO4KSE_DRIVERS_VER) +VUDUO4KSE_PLATFORM_UTIL_DIR = platform-util-vuduo4kse +VUDUO4KSE_PLATFORM_UTIL_SOURCE = platform-util-vuduo4kse-17.1-$(VUDUO4KSE_PLATFORM_UTIL_VER).r0.tar.gz +VUDUO4KSE_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util + +VUULTIMO4K_PLATFORM_UTIL_VER = $(VUULTIMO4K_DRIVERS_VER) +VUULTIMO4K_PLATFORM_UTIL_DIR = platform-util-vuultimo4k +VUULTIMO4K_PLATFORM_UTIL_SOURCE = platform-util-vuultimo4k-17.1-$(VUULTIMO4K_PLATFORM_UTIL_VER).r0.tar.gz +VUULTIMO4K_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util + +VUZERO4K_PLATFORM_UTIL_VER = $(VUZERO4K_DRIVERS_VER) +VUZERO4K_PLATFORM_UTIL_DIR = platform-util-vuzero4k +VUZERO4K_PLATFORM_UTIL_SOURCE = platform-util-vuzero4k-17.1-$(VUZERO4K_PLATFORM_UTIL_VER).r0.tar.gz +VUZERO4K_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util + +VUUNO4K_PLATFORM_UTIL_VER = $(VUUNO4K_DRIVERS_VER) +VUUNO4K_PLATFORM_UTIL_DIR = platform-util-vuuno4k +VUUNO4K_PLATFORM_UTIL_SOURCE = platform-util-vuuno4k-17.1-$(VUUNO4K_PLATFORM_UTIL_VER).r0.tar.gz +VUUNO4K_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util + +VUUNO4KSE_PLATFORM_UTIL_VER = $(VUUNO4KSE_DRIVERS_VER) +VUUNO4KSE_PLATFORM_UTIL_DIR = platform-util-vuuno4kse +VUUNO4KSE_PLATFORM_UTIL_SOURCE = platform-util-vuuno4kse-17.1-$(VUUNO4KSE_PLATFORM_UTIL_VER).r0.tar.gz +VUUNO4KSE_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util # ----------------------------------------------------------------------------- -BOXMODEL-PLATFORM-UTIL_VER = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_VER) -BOXMODEL-PLATFORM-UTIL_DIR = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_DIR) -BOXMODEL-PLATFORM-UTIL_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_SOURCE) -BOXMODEL-PLATFORM-UTIL_SITE = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_SITE) +BOXMODEL_PLATFORM_UTIL_VER = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_VER) +BOXMODEL_PLATFORM_UTIL_DIR = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_DIR) +BOXMODEL_PLATFORM_UTIL_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_SOURCE) +BOXMODEL_PLATFORM_UTIL_SITE = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_SITE) -ifneq ($(BOXMODEL-PLATFORM-UTIL_SOURCE),$(EMPTY)) -$(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE): - $(DOWNLOAD) $(BOXMODEL-PLATFORM-UTIL_SITE)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) +ifneq ($(BOXMODEL_PLATFORM_UTIL_SOURCE),$(empty)) +$(DL_DIR)/$(BOXMODEL_PLATFORM_UTIL_SOURCE): + $(DOWNLOAD) $(BOXMODEL_PLATFORM_UTIL_SITE)/$(BOXMODEL_PLATFORM_UTIL_SOURCE) endif -vuplus-platform-util: $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_DIR) - $(UNTAR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL-PLATFORM-UTIL_DIR)/* $(TARGET_bindir) +vuplus-platform-util: $(DL_DIR)/$(BOXMODEL_PLATFORM_UTIL_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(BOXMODEL_PLATFORM_UTIL_DIR) + $(UNTAR)/$(BOXMODEL_PLATFORM_UTIL_SOURCE) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL_PLATFORM_UTIL_DIR)/* $(TARGET_bindir) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vuplus-platform-util.init $(TARGET_sysconfdir)/init.d/vuplus-platform-util ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo4k)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_bindir)/bp3flash.sh endif - $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_DIR) + $(REMOVE)/$(BOXMODEL_PLATFORM_UTIL_DIR) $(TOUCH) diff --git a/make/target-development.mk b/make/target-development.mk index 306ea65d..51783621 100644 --- a/make/target-development.mk +++ b/make/target-development.mk @@ -3,13 +3,6 @@ # # ----------------------------------------------------------------------------- -VALGRIND_TARGET = $(if $(filter $(BOXMODEL),nevis),valgrind12305, valgrind3) - -valgrind: $(VALGRIND_TARGET) - $(TOUCH) - -# ----------------------------------------------------------------------------- - VALGRIND_VER = 3.13.0 VALGRIND_DIR = valgrind-$(VALGRIND_VER) VALGRIND_SOURCE = valgrind-$(VALGRIND_VER).tar.bz2 @@ -20,47 +13,23 @@ $(DL_DIR)/$(VALGRIND_SOURCE): VALGRIND_PATCH = valgrind-fix-build-$(TARGET_CPU).patch -valgrind3: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(VALGRIND_DIR) - $(UNTAR)/$(VALGRIND_SOURCE) - $(CHDIR)/$(VALGRIND_DIR); \ - $(call apply_patches,$(VALGRIND_PATCH)); \ - export AR=$(TARGET_AR); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-only32bit \ - --mandir=$(REMOVE_mandir) \ - --datadir=$(REMOVE_datadir) \ - ; \ - $(MAKE); \ - make install DESTDIR=$(TARGET_DIR) - rm -f $(addprefix $(TARGET_libdir)/valgrind/,*.a *.xml) - rm -f $(addprefix $(TARGET_bindir)/,cg_* callgrind_* ms_print) - $(REMOVE)/$(VALGRIND_DIR) - $(TOUCH) +VALGRIND_AUTORECONF = YES -# ----------------------------------------------------------------------------- +VALGRIND_CONF_OPTS = \ + --enable-only32bit \ + --datadir=$(REMOVE_datadir) -VALGRIND12305_PATCH = valgrind12305-nevis-patch.diff -VALGRIND12305_PATCH += valgrind12305-automake-1.11.2.patch - -valgrind12305: | $(TARGET_DIR) - $(REMOVE)/valgrind - svn co -r 12305 svn://svn.valgrind.org/valgrind/trunk $(BUILD_DIR)/valgrind; \ - $(CHDIR)/valgrind; \ - svn up --force -r {2011-12-13} VEX; \ - $(call apply_patches,$(VALGRIND12305_PATCH)); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-only32bit \ - --mandir=$(REMOVE_mandir) \ - --datadir=$(REMOVE_datadir) \ - ; \ +valgrind: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(call apply_patches,$(PKG_PATCH)); \ + $(CONFIGURE); \ $(MAKE); \ make install DESTDIR=$(TARGET_DIR) - $(REMOVE)/valgrind + -rm $(addprefix $(TARGET_libdir)/valgrind/,*.a *.xml) + -rm $(addprefix $(TARGET_bindir)/,cg_* callgrind_* ms_print) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -77,14 +46,10 @@ strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(STRACE_DIR) $(UNTAR)/$(STRACE_SOURCE) $(CHDIR)/$(STRACE_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --enable-silent-rules \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -f $(addprefix $(TARGET_bindir)/,strace-graph strace-log-merge) + -rm $(addprefix $(TARGET_bindir)/,strace-graph strace-log-merge) $(REMOVE)/$(STRACE_DIR) $(TOUCH) @@ -98,32 +63,31 @@ GDB_SITE = https://sourceware.org/pub/gdb/releases $(DL_DIR)/$(GDB_SOURCE): $(DOWNLOAD) $(GDB_SITE)/$(GDB_SOURCE) -GDB_DEPS = zlib ncurses +GDB_DEPS = zlib ncurses + +GDB_CONF_OPTS = \ + --infodir=$(REMOVE_infodir) \ + --disable-binutils \ + --disable-gdbserver \ + --disable-gdbtk \ + --disable-sim \ + --disable-tui \ + --disable-werror \ + --with-curses \ + --with-zlib \ + --without-mpfr \ + --without-uiout \ + --without-x \ + --enable-static gdb: $(GDB_DEPS) $(DL_DIR)/$(GDB_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(GDB_DIR) $(UNTAR)/$(GDB_SOURCE) $(CHDIR)/$(GDB_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --infodir=$(REMOVE_infodir) \ - --disable-binutils \ - --disable-gdbserver \ - --disable-gdbtk \ - --disable-sim \ - --disable-tui \ - --disable-werror \ - --with-curses \ - --with-zlib \ - --without-mpfr \ - --without-uiout \ - --without-x \ - --enable-static \ - ; \ + $(CONFIGURE); \ $(MAKE) all-gdb; \ $(MAKE) install-gdb DESTDIR=$(TARGET_DIR) - rm -rf $(addprefix $(TARGET_datadir)/,system-gdbinit) + -rm $(addprefix $(TARGET_datadir)/,system-gdbinit) find $(TARGET_datadir)/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm -- $(REMOVE)/$(GDB_DIR) $(TOUCH) diff --git a/make/target-ffmpeg-coolstream.mk b/make/target-ffmpeg-coolstream.mk index fac6a748..336914fa 100644 --- a/make/target-ffmpeg-coolstream.mk +++ b/make/target-ffmpeg-coolstream.mk @@ -4,187 +4,175 @@ # ----------------------------------------------------------------------------- FFMPEG_BRANCH ?= ni/ffmpeg/2.8 +#FFMPEG_BRANCH ?= ni/ffmpeg/master #FFMPEG_BRANCH ?= ffmpeg/master -FFMPEG_DEPS = openssl rtmpdump libbluray libass +FFMPEG_CONF_OPTS = \ + --prefix=$(prefix) \ + --cross-prefix=$(TARGET_CROSS) \ + --datadir=$(REMOVE_datadir) \ + \ + --disable-doc \ + --disable-htmlpages \ + --disable-manpages \ + --disable-podpages \ + --disable-txtpages \ + \ + --disable-ffmpeg \ + --disable-ffplay \ + --disable-ffprobe \ + --disable-ffserver \ + \ + --disable-altivec \ + --disable-mmx \ + --disable-neon \ + --disable-swscale \ + \ + --disable-parsers \ + --enable-parser=aac \ + --enable-parser=aac_latm \ + --enable-parser=ac3 \ + --enable-parser=dca \ + --enable-parser=dvbsub \ + --enable-parser=dvdsub \ + --enable-parser=flac \ + --enable-parser=h264 \ + --enable-parser=mjpeg \ + --enable-parser=mpeg4video \ + --enable-parser=mpegaudio \ + --enable-parser=mpegvideo \ + --enable-parser=vc1 \ + --enable-parser=vorbis \ + \ + --disable-decoders \ + --enable-decoder=aac \ + --enable-decoder=aac_latm \ + --enable-decoder=ass \ + --enable-decoder=adpcm_ms \ + --enable-decoder=dca \ + --enable-decoder=dvbsub \ + --enable-decoder=dvdsub \ + --enable-decoder=flac \ + --enable-decoder=flv \ + --enable-decoder=gif \ + --enable-decoder=mjpeg \ + --enable-decoder=movtext \ + --enable-decoder=mp3 \ + --enable-decoder=mp3adu \ + --enable-decoder=mp3adufloat \ + --enable-decoder=mp3float \ + --enable-decoder=mp3on4 \ + --enable-decoder=mp3on4float \ + --enable-decoder=pcm_s16le \ + --enable-decoder=pcm_s16le_planar \ + --enable-decoder=pgssub \ + --enable-decoder=srt \ + --enable-decoder=ssa \ + --enable-decoder=subrip \ + --enable-decoder=subviewer \ + --enable-decoder=subviewer1 \ + --enable-decoder=text \ + --enable-decoder=vorbis \ + --enable-decoder=xsub \ + \ + --disable-encoders \ + \ + --disable-demuxers \ + --enable-demuxer=aac \ + --enable-demuxer=ac3 \ + --enable-demuxer=ass \ + --enable-demuxer=avi \ + --enable-demuxer=dts \ + --enable-demuxer=flac \ + --enable-demuxer=flv \ + --enable-demuxer=gif \ + --enable-demuxer=hds \ + --enable-demuxer=hls \ + --enable-demuxer=live_flv \ + --enable-demuxer=m4v \ + --enable-demuxer=matroska \ + --enable-demuxer=mjpeg \ + --enable-demuxer=mov \ + --enable-demuxer=mp3 \ + --enable-demuxer=mpegps \ + --enable-demuxer=mpegts \ + --enable-demuxer=mpegtsraw \ + --enable-demuxer=mpegvideo \ + --enable-demuxer=mpjpeg \ + --enable-demuxer=ogg \ + --enable-demuxer=pcm_s16be \ + --enable-demuxer=pcm_s16le \ + --enable-demuxer=rm \ + --enable-demuxer=rtp \ + --enable-demuxer=rtsp \ + --enable-demuxer=srt \ + --enable-demuxer=vc1 \ + --enable-demuxer=wav \ + \ + --disable-muxers \ + --enable-muxer=mpegts \ + \ + --disable-filters \ + \ + --disable-devices \ + \ + --disable-extra-warnings \ + --disable-postproc \ + \ + --enable-bsfs \ + --enable-libass \ + --enable-libbluray \ + --enable-librtmp \ + --enable-network \ + --enable-nonfree \ + --enable-openssl \ + --enable-swresample \ + \ + --disable-debug \ + --enable-cross-compile \ + --enable-stripping \ + --disable-static \ + --enable-shared \ + \ + --target-os=linux \ + --arch=$(TARGET_ARCH) \ + --extra-ldflags="$(TARGET_LDFLAGS)" -# ----------------------------------------------------------------------------- +FFMPEG_DEPS = openssl rtmpdump libbluray libass ifeq ($(FFMPEG_BRANCH),ni/ffmpeg/2.8) FFMPEG_DEPS += libroxml - FFMPEG_CONFIGURE_BRANCH = else FFMPEG_DEPS += libxml2 - FFMPEG_CONFIGURE_BRANCH = \ - --enable-demuxer=dash \ - --enable-libxml2 + FFMPEG_CONF_OPTS += \ + --enable-demuxer=dash \ + --enable-libxml2 endif -# ----------------------------------------------------------------------------- - -FFMPEG_CONFIGURE_GENERIC = \ - --prefix=$(prefix) \ - --cross-prefix=$(TARGET_CROSS) \ - --datadir=$(REMOVE_datadir) \ - \ - --disable-doc \ - --disable-htmlpages \ - --disable-manpages \ - --disable-podpages \ - --disable-txtpages \ - \ - --disable-ffmpeg \ - --disable-ffplay \ - --disable-ffprobe \ - --disable-ffserver \ - \ - --disable-altivec \ - --disable-mmx \ - --disable-neon \ - --disable-swscale \ - \ - --disable-parsers \ - --enable-parser=aac \ - --enable-parser=aac_latm \ - --enable-parser=ac3 \ - --enable-parser=dca \ - --enable-parser=dvbsub \ - --enable-parser=dvdsub \ - --enable-parser=flac \ - --enable-parser=h264 \ - --enable-parser=mjpeg \ - --enable-parser=mpeg4video \ - --enable-parser=mpegaudio \ - --enable-parser=mpegvideo \ - --enable-parser=vc1 \ - --enable-parser=vorbis \ - \ - --disable-decoders \ - --enable-decoder=aac \ - --enable-decoder=aac_latm \ - --enable-decoder=ass \ - --enable-decoder=adpcm_ms \ - --enable-decoder=dca \ - --enable-decoder=dvbsub \ - --enable-decoder=dvdsub \ - --enable-decoder=flac \ - --enable-decoder=flv \ - --enable-decoder=gif \ - --enable-decoder=mjpeg \ - --enable-decoder=movtext \ - --enable-decoder=mp3 \ - --enable-decoder=mp3adu \ - --enable-decoder=mp3adufloat \ - --enable-decoder=mp3float \ - --enable-decoder=mp3on4 \ - --enable-decoder=mp3on4float \ - --enable-decoder=pcm_s16le \ - --enable-decoder=pcm_s16le_planar \ - --enable-decoder=pgssub \ - --enable-decoder=srt \ - --enable-decoder=ssa \ - --enable-decoder=subrip \ - --enable-decoder=subviewer \ - --enable-decoder=subviewer1 \ - --enable-decoder=text \ - --enable-decoder=vorbis \ - --enable-decoder=xsub \ - \ - --disable-encoders \ - \ - --disable-demuxers \ - --enable-demuxer=aac \ - --enable-demuxer=ac3 \ - --enable-demuxer=ass \ - --enable-demuxer=avi \ - --enable-demuxer=dts \ - --enable-demuxer=flac \ - --enable-demuxer=flv \ - --enable-demuxer=gif \ - --enable-demuxer=hds \ - --enable-demuxer=hls \ - --enable-demuxer=live_flv \ - --enable-demuxer=m4v \ - --enable-demuxer=matroska \ - --enable-demuxer=mjpeg \ - --enable-demuxer=mov \ - --enable-demuxer=mp3 \ - --enable-demuxer=mpegps \ - --enable-demuxer=mpegts \ - --enable-demuxer=mpegtsraw \ - --enable-demuxer=mpegvideo \ - --enable-demuxer=mpjpeg \ - --enable-demuxer=ogg \ - --enable-demuxer=pcm_s16be \ - --enable-demuxer=pcm_s16le \ - --enable-demuxer=rm \ - --enable-demuxer=rtp \ - --enable-demuxer=rtsp \ - --enable-demuxer=srt \ - --enable-demuxer=vc1 \ - --enable-demuxer=wav \ - \ - --disable-muxers \ - --enable-muxer=mpegts \ - \ - --disable-filters \ - \ - --disable-devices \ - \ - --disable-extra-warnings \ - --disable-postproc \ - \ - --enable-bsfs \ - --enable-libass \ - --enable-libbluray \ - --enable-librtmp \ - --enable-network \ - --enable-nonfree \ - --enable-openssl \ - --enable-swresample \ - \ - --disable-debug \ - --enable-cross-compile \ - --enable-stripping \ - --disable-static \ - --enable-shared \ - \ - --target-os=linux \ - --arch=$(TARGET_ARCH) \ - --extra-ldflags="$(TARGET_LDFLAGS)" - -# ----------------------------------------------------------------------------- - ifeq ($(BOXSERIES),hd1) - FFMPEG_CONFIGURE_PLATFORM = \ - --enable-small \ - --cpu=armv6 \ - --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)" + FFMPEG_CONF_OPTS += \ + --enable-small \ + --cpu=armv6 \ + --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)" endif ifeq ($(BOXSERIES),hd2) - FFMPEG_CONFIGURE_PLATFORM = \ - --enable-decoder=h264 \ - --enable-decoder=vc1 \ - --enable-hardcoded-tables \ - --cpu=cortex-a9 \ - --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=vfpv3-d16 -mfloat-abi=hard" + FFMPEG_CONF_OPTS += \ + --enable-decoder=h264 \ + --enable-decoder=vc1 \ + --enable-hardcoded-tables \ + --cpu=cortex-a9 \ + --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=vfpv3-d16 -mfloat-abi=hard" endif -# ----------------------------------------------------------------------------- - ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(NI-FFMPEG) - $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); \ + $(REMOVE)/$(NI_FFMPEG) + $(CD) $(SOURCE_DIR)/$(NI_FFMPEG); \ git checkout $(FFMPEG_BRANCH) - tar -C $(SOURCE_DIR) -cp $(NI-FFMPEG) --exclude-vcs | tar -C $(BUILD_DIR) -x - $(CHDIR)/$(NI-FFMPEG); \ - ./configure \ - $(FFMPEG_CONFIGURE_GENERIC) \ - $(FFMPEG_CONFIGURE_PLATFORM) \ - $(FFMPEG_CONFIGURE_BRANCH) \ - ; \ + tar -C $(SOURCE_DIR) -cp $(NI_FFMPEG) --exclude-vcs | tar -C $(BUILD_DIR) -x + $(CHDIR)/$(NI_FFMPEG); \ + ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(NI-FFMPEG) + $(REMOVE)/$(NI_FFMPEG) $(TOUCH) diff --git a/make/target-ffmpeg.mk b/make/target-ffmpeg.mk index 3f947d48..8478055e 100644 --- a/make/target-ffmpeg.mk +++ b/make/target-ffmpeg.mk @@ -13,348 +13,337 @@ $(DL_DIR)/$(FFMPEG_SOURCE): FFMPEG_UNPATCHED := no -# ----------------------------------------------------------------------------- - -FFMPEG_DEPS = openssl freetype rtmpdump libbluray libass libxml2 alsa-lib - -# ----------------------------------------------------------------------------- - -FFMPEG_CONFIGURE_GENERIC = \ - --prefix=$(prefix) \ - --cross-prefix=$(TARGET_CROSS) \ - --datadir=$(REMOVE_datadir) \ - \ - --disable-doc \ - --disable-htmlpages \ - --disable-manpages \ - --disable-podpages \ - --disable-txtpages \ - \ - --disable-ffplay \ - --enable-ffprobe \ - \ - --disable-altivec \ - --disable-amd3dnow \ - --disable-amd3dnowext \ - --disable-armv5te \ - --disable-armv6 \ - --disable-armv6t2 \ - --disable-avx \ - --disable-avx2 \ - --disable-fast-unaligned \ - --disable-fma3 \ - --disable-fma4 \ - --disable-inline-asm \ - --disable-mips32r2 \ - --disable-mipsdsp \ - --disable-mipsdspr2 \ - --disable-mmx \ - --disable-mmxext \ - --disable-sse \ - --disable-sse2 \ - --disable-sse3 \ - --disable-sse4 \ - --disable-sse42 \ - --disable-ssse3 \ - --disable-vfp \ - --disable-xop \ - --disable-x86asm \ - \ - --disable-dxva2 \ - --disable-vaapi \ - --disable-vdpau \ - \ - --disable-parsers \ - --enable-parser=aac \ - --enable-parser=aac_latm \ - --enable-parser=ac3 \ - --enable-parser=dca \ - --enable-parser=dvbsub \ - --enable-parser=dvd_nav \ - --enable-parser=dvdsub \ - --enable-parser=flac \ - --enable-parser=h264 \ - --enable-parser=hevc \ - --enable-parser=mjpeg \ - --enable-parser=mpeg4video \ - --enable-parser=mpegaudio \ - --enable-parser=mpegvideo \ - --enable-parser=png \ - --enable-parser=vc1 \ - --enable-parser=vorbis \ - --enable-parser=vp8 \ - --enable-parser=vp9 \ - \ - --disable-decoders \ - --enable-decoder=aac \ - --enable-decoder=aac_latm \ - --enable-decoder=adpcm_ct \ - --enable-decoder=adpcm_g722 \ - --enable-decoder=adpcm_g726 \ - --enable-decoder=adpcm_g726le \ - --enable-decoder=adpcm_ima_amv \ - --enable-decoder=adpcm_ima_oki \ - --enable-decoder=adpcm_ima_qt \ - --enable-decoder=adpcm_ima_rad \ - --enable-decoder=adpcm_ima_wav \ - --enable-decoder=adpcm_ms \ - --enable-decoder=adpcm_sbpro_2 \ - --enable-decoder=adpcm_sbpro_3 \ - --enable-decoder=adpcm_sbpro_4 \ - --enable-decoder=adpcm_swf \ - --enable-decoder=adpcm_yamaha \ - --enable-decoder=alac \ - --enable-decoder=ape \ - --enable-decoder=ass \ - --enable-decoder=atrac1 \ - --enable-decoder=atrac3 \ - --enable-decoder=atrac3p \ - --enable-decoder=cook \ - --enable-decoder=dca \ - --enable-decoder=dsd_lsbf \ - --enable-decoder=dsd_lsbf_planar \ - --enable-decoder=dsd_msbf \ - --enable-decoder=dsd_msbf_planar \ - --enable-decoder=dvbsub \ - --enable-decoder=dvdsub \ - --enable-decoder=eac3 \ - --enable-decoder=evrc \ - --enable-decoder=flac \ - --enable-decoder=flv \ - --enable-decoder=g723_1 \ - --enable-decoder=g729 \ - --enable-decoder=gif \ - --enable-decoder=h261 \ - --enable-decoder=h263 \ - --enable-decoder=h263i \ - --enable-decoder=h264 \ - --enable-decoder=hevc \ - --enable-decoder=iac \ - --enable-decoder=imc \ - --enable-decoder=jpeg2000 \ - --enable-decoder=jpegls \ - --enable-decoder=mace3 \ - --enable-decoder=mace6 \ - --enable-decoder=metasound \ - --enable-decoder=mjpeg \ - --enable-decoder=mlp \ - --enable-decoder=movtext \ - --enable-decoder=mp1 \ - --enable-decoder=mp3 \ - --enable-decoder=mp3adu \ - --enable-decoder=mp3adufloat \ - --enable-decoder=mp3float \ - --enable-decoder=mp3on4 \ - --enable-decoder=mp3on4float \ - --enable-decoder=mpeg1video \ - --enable-decoder=mpeg2video \ - --enable-decoder=mpeg4 \ - --enable-decoder=nellymoser \ - --enable-decoder=opus \ - --enable-decoder=pcm_alaw \ - --enable-decoder=pcm_bluray \ - --enable-decoder=pcm_dvd \ - --enable-decoder=pcm_f32be \ - --enable-decoder=pcm_f32le \ - --enable-decoder=pcm_f64be \ - --enable-decoder=pcm_f64le \ - --enable-decoder=pcm_lxf \ - --enable-decoder=pcm_mulaw \ - --enable-decoder=pcm_s16be \ - --enable-decoder=pcm_s16be_planar \ - --enable-decoder=pcm_s16le \ - --enable-decoder=pcm_s16le_planar \ - --enable-decoder=pcm_s24be \ - --enable-decoder=pcm_s24daud \ - --enable-decoder=pcm_s24le \ - --enable-decoder=pcm_s24le_planar \ - --enable-decoder=pcm_s32be \ - --enable-decoder=pcm_s32le \ - --enable-decoder=pcm_s32le_planar \ - --enable-decoder=pcm_s8 \ - --enable-decoder=pcm_s8_planar \ - --enable-decoder=pcm_u16be \ - --enable-decoder=pcm_u16le \ - --enable-decoder=pcm_u24be \ - --enable-decoder=pcm_u24le \ - --enable-decoder=pcm_u32be \ - --enable-decoder=pcm_u32le \ - --enable-decoder=pcm_u8 \ - --enable-decoder=pcm_zork \ - --enable-decoder=pgssub \ - --enable-decoder=png \ - --enable-decoder=qcelp \ - --enable-decoder=qdm2 \ - --enable-decoder=ra_144 \ - --enable-decoder=ra_288 \ - --enable-decoder=ralf \ - --enable-decoder=s302m \ - --enable-decoder=shorten \ - --enable-decoder=sipr \ - --enable-decoder=sonic \ - --enable-decoder=srt \ - --enable-decoder=ssa \ - --enable-decoder=subrip \ - --enable-decoder=subviewer \ - --enable-decoder=subviewer1 \ - --enable-decoder=tak \ - --enable-decoder=text \ - --enable-decoder=truehd \ - --enable-decoder=truespeech \ - --enable-decoder=tta \ - --enable-decoder=vorbis \ - --enable-decoder=wavpack \ - --enable-decoder=wmalossless \ - --enable-decoder=wmapro \ - --enable-decoder=wmav1 \ - --enable-decoder=wmav2 \ - --enable-decoder=wmavoice \ - --enable-decoder=xsub \ - \ - --disable-encoders \ - --enable-encoder=aac \ - --enable-encoder=h261 \ - --enable-encoder=h263 \ - --enable-encoder=h263p \ - --enable-encoder=jpeg2000 \ - --enable-encoder=jpegls \ - --enable-encoder=ljpeg \ - --enable-encoder=mjpeg \ - --enable-encoder=mpeg1video \ - --enable-encoder=mpeg2video \ - --enable-encoder=mpeg4 \ - --enable-encoder=png \ - --enable-encoder=rawvideo \ - \ - --disable-demuxers \ - --enable-demuxer=aac \ - --enable-demuxer=ac3 \ - --enable-demuxer=apng \ - --enable-demuxer=ass \ - --enable-demuxer=avi \ - --enable-demuxer=dash \ - --enable-demuxer=dts \ - --enable-demuxer=ffmetadata \ - --enable-demuxer=flac \ - --enable-demuxer=flv \ - --enable-demuxer=gif \ - --enable-demuxer=h264 \ - --enable-demuxer=hls \ - --enable-demuxer=live_flv \ - --enable-demuxer=image_bmp_pipe \ - --enable-demuxer=image_jpeg_pipe \ - --enable-demuxer=image_jpegls_pipe \ - --enable-demuxer=image_png_pipe \ - --enable-demuxer=image2 \ - --enable-demuxer=image2pipe \ - --enable-demuxer=m4v \ - --enable-demuxer=matroska \ - --enable-demuxer=mjpeg \ - --enable-demuxer=mov \ - --enable-demuxer=mp3 \ - --enable-demuxer=mpegps \ - --enable-demuxer=mpegts \ - --enable-demuxer=mpegtsraw \ - --enable-demuxer=mpegvideo \ - --enable-demuxer=mpjpeg \ - --enable-demuxer=ogg \ - --enable-demuxer=pcm_s16be \ - --enable-demuxer=pcm_s16le \ - --enable-demuxer=rawvideo \ - --enable-demuxer=realtext \ - --enable-demuxer=rm \ - --enable-demuxer=rtp \ - --enable-demuxer=rtsp \ - --enable-demuxer=srt \ - --enable-demuxer=vc1 \ - --enable-demuxer=wav \ - --enable-demuxer=webm_dash_manifest \ - \ - --disable-muxers \ - --enable-muxer=apng \ - --enable-muxer=flac \ - --enable-muxer=h261 \ - --enable-muxer=h263 \ - --enable-muxer=h264 \ - --enable-muxer=hevc \ - --enable-muxer=image2 \ - --enable-muxer=image2pipe \ - --enable-muxer=m4v \ - --enable-muxer=matroska \ - --enable-muxer=mjpeg \ - --enable-muxer=mp3 \ - --enable-muxer=mp4 \ - --enable-muxer=mpeg1video \ - --enable-muxer=mpeg2video \ - --enable-muxer=mpegts \ - --enable-muxer=ogg \ - \ - --disable-filters \ - --enable-filter=drawtext \ - --enable-filter=scale \ - \ - --disable-extra-warnings \ - --disable-postproc \ - \ - --enable-bsfs \ - --enable-libass \ - --enable-libbluray \ - --enable-libfreetype \ - --enable-librtmp \ - --enable-network \ - --enable-nonfree \ - --enable-openssl \ - --enable-zlib \ - \ - --disable-xlib \ - --disable-libxcb \ - --disable-libxcb-shm \ - --disable-libxcb-xfixes \ - --disable-libxcb-shape \ - \ - --disable-debug \ - --enable-cross-compile \ - --enable-stripping \ - --disable-static \ - --enable-shared \ - --disable-runtime-cpudetect \ - --enable-pic \ - --enable-pthreads \ - --enable-swresample \ - --enable-hardcoded-tables \ - \ - --target-os=linux \ - --arch=$(TARGET_ARCH) \ - --extra-ldflags="$(TARGET_LDFLAGS)" - -# ----------------------------------------------------------------------------- +FFMPEG_CONF_OPTS = \ + --prefix=$(prefix) \ + --cross-prefix=$(TARGET_CROSS) \ + --datadir=$(REMOVE_datadir) \ + \ + --disable-doc \ + --disable-htmlpages \ + --disable-manpages \ + --disable-podpages \ + --disable-txtpages \ + \ + --disable-ffplay \ + --enable-ffprobe \ + \ + --disable-altivec \ + --disable-amd3dnow \ + --disable-amd3dnowext \ + --disable-armv5te \ + --disable-armv6 \ + --disable-armv6t2 \ + --disable-avx \ + --disable-avx2 \ + --disable-fast-unaligned \ + --disable-fma3 \ + --disable-fma4 \ + --disable-inline-asm \ + --disable-mips32r2 \ + --disable-mipsdsp \ + --disable-mipsdspr2 \ + --disable-mmx \ + --disable-mmxext \ + --disable-sse \ + --disable-sse2 \ + --disable-sse3 \ + --disable-sse4 \ + --disable-sse42 \ + --disable-ssse3 \ + --disable-vfp \ + --disable-xop \ + --disable-x86asm \ + \ + --disable-dxva2 \ + --disable-vaapi \ + --disable-vdpau \ + \ + --disable-parsers \ + --enable-parser=aac \ + --enable-parser=aac_latm \ + --enable-parser=ac3 \ + --enable-parser=dca \ + --enable-parser=dvbsub \ + --enable-parser=dvd_nav \ + --enable-parser=dvdsub \ + --enable-parser=flac \ + --enable-parser=h264 \ + --enable-parser=hevc \ + --enable-parser=mjpeg \ + --enable-parser=mpeg4video \ + --enable-parser=mpegaudio \ + --enable-parser=mpegvideo \ + --enable-parser=png \ + --enable-parser=vc1 \ + --enable-parser=vorbis \ + --enable-parser=vp8 \ + --enable-parser=vp9 \ + \ + --disable-decoders \ + --enable-decoder=aac \ + --enable-decoder=aac_latm \ + --enable-decoder=adpcm_ct \ + --enable-decoder=adpcm_g722 \ + --enable-decoder=adpcm_g726 \ + --enable-decoder=adpcm_g726le \ + --enable-decoder=adpcm_ima_amv \ + --enable-decoder=adpcm_ima_oki \ + --enable-decoder=adpcm_ima_qt \ + --enable-decoder=adpcm_ima_rad \ + --enable-decoder=adpcm_ima_wav \ + --enable-decoder=adpcm_ms \ + --enable-decoder=adpcm_sbpro_2 \ + --enable-decoder=adpcm_sbpro_3 \ + --enable-decoder=adpcm_sbpro_4 \ + --enable-decoder=adpcm_swf \ + --enable-decoder=adpcm_yamaha \ + --enable-decoder=alac \ + --enable-decoder=ape \ + --enable-decoder=ass \ + --enable-decoder=atrac1 \ + --enable-decoder=atrac3 \ + --enable-decoder=atrac3p \ + --enable-decoder=cook \ + --enable-decoder=dca \ + --enable-decoder=dsd_lsbf \ + --enable-decoder=dsd_lsbf_planar \ + --enable-decoder=dsd_msbf \ + --enable-decoder=dsd_msbf_planar \ + --enable-decoder=dvbsub \ + --enable-decoder=dvdsub \ + --enable-decoder=eac3 \ + --enable-decoder=evrc \ + --enable-decoder=flac \ + --enable-decoder=flv \ + --enable-decoder=g723_1 \ + --enable-decoder=g729 \ + --enable-decoder=gif \ + --enable-decoder=h261 \ + --enable-decoder=h263 \ + --enable-decoder=h263i \ + --enable-decoder=h264 \ + --enable-decoder=hevc \ + --enable-decoder=iac \ + --enable-decoder=imc \ + --enable-decoder=jpeg2000 \ + --enable-decoder=jpegls \ + --enable-decoder=mace3 \ + --enable-decoder=mace6 \ + --enable-decoder=metasound \ + --enable-decoder=mjpeg \ + --enable-decoder=mlp \ + --enable-decoder=movtext \ + --enable-decoder=mp1 \ + --enable-decoder=mp3 \ + --enable-decoder=mp3adu \ + --enable-decoder=mp3adufloat \ + --enable-decoder=mp3float \ + --enable-decoder=mp3on4 \ + --enable-decoder=mp3on4float \ + --enable-decoder=mpeg1video \ + --enable-decoder=mpeg2video \ + --enable-decoder=mpeg4 \ + --enable-decoder=nellymoser \ + --enable-decoder=opus \ + --enable-decoder=pcm_alaw \ + --enable-decoder=pcm_bluray \ + --enable-decoder=pcm_dvd \ + --enable-decoder=pcm_f32be \ + --enable-decoder=pcm_f32le \ + --enable-decoder=pcm_f64be \ + --enable-decoder=pcm_f64le \ + --enable-decoder=pcm_lxf \ + --enable-decoder=pcm_mulaw \ + --enable-decoder=pcm_s16be \ + --enable-decoder=pcm_s16be_planar \ + --enable-decoder=pcm_s16le \ + --enable-decoder=pcm_s16le_planar \ + --enable-decoder=pcm_s24be \ + --enable-decoder=pcm_s24daud \ + --enable-decoder=pcm_s24le \ + --enable-decoder=pcm_s24le_planar \ + --enable-decoder=pcm_s32be \ + --enable-decoder=pcm_s32le \ + --enable-decoder=pcm_s32le_planar \ + --enable-decoder=pcm_s8 \ + --enable-decoder=pcm_s8_planar \ + --enable-decoder=pcm_u16be \ + --enable-decoder=pcm_u16le \ + --enable-decoder=pcm_u24be \ + --enable-decoder=pcm_u24le \ + --enable-decoder=pcm_u32be \ + --enable-decoder=pcm_u32le \ + --enable-decoder=pcm_u8 \ + --enable-decoder=pcm_zork \ + --enable-decoder=pgssub \ + --enable-decoder=png \ + --enable-decoder=qcelp \ + --enable-decoder=qdm2 \ + --enable-decoder=ra_144 \ + --enable-decoder=ra_288 \ + --enable-decoder=ralf \ + --enable-decoder=s302m \ + --enable-decoder=shorten \ + --enable-decoder=sipr \ + --enable-decoder=sonic \ + --enable-decoder=srt \ + --enable-decoder=ssa \ + --enable-decoder=subrip \ + --enable-decoder=subviewer \ + --enable-decoder=subviewer1 \ + --enable-decoder=tak \ + --enable-decoder=text \ + --enable-decoder=truehd \ + --enable-decoder=truespeech \ + --enable-decoder=tta \ + --enable-decoder=vorbis \ + --enable-decoder=wavpack \ + --enable-decoder=wmalossless \ + --enable-decoder=wmapro \ + --enable-decoder=wmav1 \ + --enable-decoder=wmav2 \ + --enable-decoder=wmavoice \ + --enable-decoder=xsub \ + \ + --disable-encoders \ + --enable-encoder=aac \ + --enable-encoder=h261 \ + --enable-encoder=h263 \ + --enable-encoder=h263p \ + --enable-encoder=jpeg2000 \ + --enable-encoder=jpegls \ + --enable-encoder=ljpeg \ + --enable-encoder=mjpeg \ + --enable-encoder=mpeg1video \ + --enable-encoder=mpeg2video \ + --enable-encoder=mpeg4 \ + --enable-encoder=png \ + --enable-encoder=rawvideo \ + \ + --disable-demuxers \ + --enable-demuxer=aac \ + --enable-demuxer=ac3 \ + --enable-demuxer=apng \ + --enable-demuxer=ass \ + --enable-demuxer=avi \ + --enable-demuxer=dash \ + --enable-demuxer=dts \ + --enable-demuxer=ffmetadata \ + --enable-demuxer=flac \ + --enable-demuxer=flv \ + --enable-demuxer=gif \ + --enable-demuxer=h264 \ + --enable-demuxer=hls \ + --enable-demuxer=live_flv \ + --enable-demuxer=image_bmp_pipe \ + --enable-demuxer=image_jpeg_pipe \ + --enable-demuxer=image_jpegls_pipe \ + --enable-demuxer=image_png_pipe \ + --enable-demuxer=image2 \ + --enable-demuxer=image2pipe \ + --enable-demuxer=m4v \ + --enable-demuxer=matroska \ + --enable-demuxer=mjpeg \ + --enable-demuxer=mov \ + --enable-demuxer=mp3 \ + --enable-demuxer=mpegps \ + --enable-demuxer=mpegts \ + --enable-demuxer=mpegtsraw \ + --enable-demuxer=mpegvideo \ + --enable-demuxer=mpjpeg \ + --enable-demuxer=ogg \ + --enable-demuxer=pcm_s16be \ + --enable-demuxer=pcm_s16le \ + --enable-demuxer=rawvideo \ + --enable-demuxer=realtext \ + --enable-demuxer=rm \ + --enable-demuxer=rtp \ + --enable-demuxer=rtsp \ + --enable-demuxer=srt \ + --enable-demuxer=vc1 \ + --enable-demuxer=wav \ + --enable-demuxer=webm_dash_manifest \ + \ + --disable-muxers \ + --enable-muxer=apng \ + --enable-muxer=flac \ + --enable-muxer=h261 \ + --enable-muxer=h263 \ + --enable-muxer=h264 \ + --enable-muxer=hevc \ + --enable-muxer=image2 \ + --enable-muxer=image2pipe \ + --enable-muxer=m4v \ + --enable-muxer=matroska \ + --enable-muxer=mjpeg \ + --enable-muxer=mp3 \ + --enable-muxer=mp4 \ + --enable-muxer=mpeg1video \ + --enable-muxer=mpeg2video \ + --enable-muxer=mpegts \ + --enable-muxer=ogg \ + \ + --disable-filters \ + --enable-filter=drawtext \ + --enable-filter=scale \ + \ + --disable-extra-warnings \ + --disable-postproc \ + \ + --enable-bsfs \ + --enable-libass \ + --enable-libbluray \ + --enable-libfreetype \ + --enable-librtmp \ + --enable-network \ + --enable-nonfree \ + --enable-openssl \ + --enable-zlib \ + \ + --disable-xlib \ + --disable-libxcb \ + --disable-libxcb-shm \ + --disable-libxcb-xfixes \ + --disable-libxcb-shape \ + \ + --disable-debug \ + --enable-cross-compile \ + --enable-stripping \ + --disable-static \ + --enable-shared \ + --disable-runtime-cpudetect \ + --enable-pic \ + --enable-pthreads \ + --enable-swresample \ + --enable-hardcoded-tables \ + \ + --target-os=linux \ + --arch=$(TARGET_ARCH) \ + --extra-ldflags="$(TARGET_LDFLAGS)" ifeq ($(TARGET_ARCH),arm) - FFMPEG_CONFIGURE_PLATFORM = \ - --cpu=cortex-a15 \ - --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=neon-vfpv4 -mfloat-abi=hard" + FFMPEG_CONF_OPTS += \ + --cpu=cortex-a15 \ + --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=neon-vfpv4 -mfloat-abi=hard" else ifeq ($(TARGET_ARCH),mips) - FFMPEG_CONFIGURE_PLATFORM = \ - --cpu=generic \ - --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)" + FFMPEG_CONF_OPTS += \ + --cpu=generic \ + --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)" endif -# ----------------------------------------------------------------------------- +FFMPEG_DEPS = openssl freetype rtmpdump libbluray libass libxml2 alsa-lib ffmpeg: $(FFMPEG_DEPS) $(DL_DIR)/$(FFMPEG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FFMPEG_DIR) - $(UNTAR)/$(FFMPEG_SOURCE) -ifneq ($(FFMPEG_UNPATCHED),yes) - $(CHDIR)/$(FFMPEG_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) +ifneq ($($(PKG)_UNPATCHED),yes) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES) endif - $(CHDIR)/$(FFMPEG_DIR); \ - ./configure \ - $(FFMPEG_CONFIGURE_GENERIC) \ - $(FFMPEG_CONFIGURE_PLATFORM) \ - ; \ + $(CHDIR)/$(PKG_DIR); \ + ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(FFMPEG_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) diff --git a/make/target-files.mk b/make/target-files.mk index 53de988c..367c8850 100644 --- a/make/target-files.mk +++ b/make/target-files.mk @@ -90,7 +90,7 @@ endif $(TARGET_sysconfdir)/profile.d: $(foreach p,$(wildcard $(TARGET_FILES)/files-etc/profile.d/*.sh),\ - $(INSTALL_DATA) -D $(p) $(TARGET_sysconfdir)/profile.d/$(notdir $(p)) $(sep)) + $(INSTALL_DATA) -D $(p) $(TARGET_sysconfdir)/profile.d/$(notdir $(p))$(sep)) $(TARGET_sysconfdir)/services: $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/services $(@) diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk index e3722c7a..17f61260 100644 --- a/make/target-libs-static.mk +++ b/make/target-libs-static.mk @@ -10,39 +10,40 @@ endif libs-static: $(LIBS-STATIC) | $(TARGET_DIR) $(INSTALL_COPY) $(STATIC_DIR)/. $(TARGET_DIR)/ - $(REWRITE_LIBTOOL_LA) + $(REWRITE_LIBTOOL) # ----------------------------------------------------------------------------- -CORTEX-STRINGS_VER = 48fd30c -CORTEX-STRINGS_DIR = cortex-strings-$(CORTEX-STRINGS_VER) -CORTEX-STRINGS_SOURCE = cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 -CORTEX-STRINGS_SITE = http://git.linaro.org/git-ro/toolchain/cortex-strings.git +CORTEX_STRINGS_VER = 48fd30c +CORTEX_STRINGS_DIR = cortex-strings-$(CORTEX_STRINGS_VER) +CORTEX_STRINGS_SOURCE = cortex-strings-$(CORTEX_STRINGS_VER).tar.bz2 +CORTEX_STRINGS_SITE = http://git.linaro.org/git-ro/toolchain/cortex-strings.git -$(DL_DIR)/$(CORTEX-STRINGS_SOURCE): - $(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_SITE) $(CORTEX-STRINGS_VER) $(@F) $(DL_DIR) +$(DL_DIR)/$(CORTEX_STRINGS_SOURCE): + $(GET-GIT-ARCHIVE) $(CORTEX_STRINGS_SITE) $(CORTEX_STRINGS_VER) $(@F) $(DL_DIR) -CORTEX-STRINGS_CONF = $(if $(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse),--with-neon,--without-neon) +CORTEX_STRINGS_CONF_ENV = \ + CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \ + CPPFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \ + CXXFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \ + LDFLAGS="-Wl,-O1 -L$(TARGET_libdir)" + +CORTEX_STRINGS_CONF_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + $(if $(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse),--with-neon,--without-neon) \ + --enable-static \ + --disable-shared cortex-strings: $(STATIC_libdir)/libcortex-strings.la -$(STATIC_libdir)/libcortex-strings.la: $(DL_DIR)/$(CORTEX-STRINGS_SOURCE) | $(STATIC_DIR) - $(REMOVE)/$(CORTEX-STRINGS_DIR) - $(UNTAR)/$(CORTEX-STRINGS_SOURCE) - $(CHDIR)/$(CORTEX-STRINGS_DIR); \ +$(STATIC_libdir)/libcortex-strings.la: $(DL_DIR)/$(CORTEX_STRINGS_SOURCE) | $(STATIC_DIR) + $(REMOVE)/$(CORTEX_STRINGS_DIR) + $(UNTAR)/$(CORTEX_STRINGS_SOURCE) + $(CHDIR)/$(CORTEX_STRINGS_DIR); \ ./autogen.sh; \ - CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \ - CPPFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \ - CXXFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \ - LDFLAGS="-Wl,-O1 -L$(TARGET_libdir)" \ - ./configure $(CONFIGURE_OPTS) \ - --prefix=$(prefix) \ - --disable-shared \ - --enable-static \ - $(CORTEX-STRINGS_CONF) \ - ; \ + $(CORTEX_STRINGS_CONF_ENV) ./configure $(CORTEX_STRINGS_CONF_OPTS); \ $(MAKE); \ $(MAKE) install DESTDIR=$(STATIC_DIR) - $(REMOVE)/$(CORTEX-STRINGS_DIR) + $(REMOVE)/$(CORTEX_STRINGS_DIR) # ----------------------------------------------------------------------------- diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk index 40461d07..fce3ac74 100644 --- a/make/target-libs-unused.mk +++ b/make/target-libs-unused.mk @@ -11,49 +11,23 @@ LIBID3TAG_SITE = https://sourceforge.net/projects/mad/files/libid3tag/$(LIBID3 $(DL_DIR)/$(LIBID3TAG_SOURCE): $(DOWNLOAD) $(LIBID3TAG_SITE)/$(LIBID3TAG_SOURCE) -LIBID3TAG_PATCH = libid3tag-pc.patch +LIBID3TAG_DEPS = zlib -LIBID3TAG_DEPS = zlib +LIBID3TAG_AUTORECONF = YES + +LIBID3TAG_CONF_OPTS = \ + --enable-shared=yes libid3tag: $(LIBID3TAG_DEPS) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBID3TAG_DIR) - $(UNTAR)/$(LIBID3TAG_SOURCE) - $(CHDIR)/$(LIBID3TAG_DIR); \ - $(call apply_patches,$(LIBID3TAG_PATCH)); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-shared=yes \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBID3TAG_DIR) - $(TOUCH) - -# ----------------------------------------------------------------------------- - -BZIP2_VER = 1.0.8 -BZIP2_DIR = bzip2-$(BZIP2_VER) -BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz -BZIP2_SITE = https://sourceware.org/pub/bzip2 - -$(DL_DIR)/$(BZIP2_SOURCE): - $(DOWNLOAD) $(BZIP2_SITE)/$(BZIP2_SOURCE) - -BZIP2_PATCH = bzip2.patch - -bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BZIP2_DIR) - $(UNTAR)/$(BZIP2_SOURCE) - $(CHDIR)/$(BZIP2_DIR); \ - $(call apply_patches,$(BZIP2_PATCH)); \ - mv Makefile-libbz2_so Makefile; \ - $(MAKE_ENV) \ - $(MAKE); \ - $(MAKE) install PREFIX=$(TARGET_DIR) - rm -f $(TARGET_bindir)/bzip2 - $(REMOVE)/$(BZIP2_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -66,24 +40,25 @@ FONTCONFIG_SITE = https://www.freedesktop.org/software/fontconfig/release $(DL_DIR)/$(FONTCONFIG_SOURCE): $(DOWNLOAD) $(FONTCONFIG_SITE)/$(FONTCONFIG_SOURCE) -FONTCONFIG_DEPS = freetype expat +FONTCONFIG_DEPS = freetype expat + +FONTCONFIG_CONF_OPTS = \ + --with-freetype-config=$(HOST_DIR)/bin/freetype-config \ + --with-expat-includes=$(TARGET_includedir) \ + --with-expat-lib=$(TARGET_libdir) \ + --disable-docs fontconfig: $(FONTCONFIG_DEPS) $(DL_DIR)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FONTCONFIG_DIR) - $(UNTAR)/$(FONTCONFIG_SOURCE) - $(CHDIR)/$(FONTCONFIG_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --with-freetype-config=$(HOST_DIR)/bin/freetype-config \ - --with-expat-includes=$(TARGET_includedir) \ - --with-expat-lib=$(TARGET_libdir) \ - --sysconfdir=/etc \ - --disable-docs \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(FONTCONFIG_DIR) + $(REWRITE_CONFIG) $(HOST_DIR)/bin/freetype-config + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -96,28 +71,24 @@ PIXMAN_SITE = https://www.cairographics.org/releases $(DL_DIR)/$(PIXMAN_SOURCE): $(DOWNLOAD) $(PIXMAN_SITE)/$(PIXMAN_SOURCE) -PIXMAN_PATCH = pixman-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch -PIXMAN_PATCH += pixman-asm_include.patch -PIXMAN_PATCH += pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch +PIXMAN_DEPS = zlib libpng -PIXMAN_DEPS = zlib libpng +PIXMAN_CONF_OPTS = \ + --disable-gtk \ + --disable-arm-simd \ + --disable-loongson-mmi \ + --disable-docs pixman: $(PIXMAN_DEPS) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(PIXMAN_DIR) - $(UNTAR)/$(PIXMAN_SOURCE) - $(CHDIR)/$(PIXMAN_DIR); \ - $(call apply_patches,$(PIXMAN_PATCH)); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --disable-gtk \ - --disable-arm-simd \ - --disable-loongson-mmi \ - --disable-docs \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(PIXMAN_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -130,27 +101,27 @@ CAIRO_SITE = https://www.cairographics.org/releases $(DL_DIR)/$(CAIRO_SOURCE): $(DOWNLOAD) $(CAIRO_SITE)/$(CAIRO_SOURCE) -CAIRO_PATCH = cairo-get_bitmap_surface.diff +CAIRO_DEPS = fontconfig glib2 libpng pixman zlib + +CAIRO_CONF_ENV = \ + ax_cv_c_float_words_bigendian="no" -CAIRO_DEPS = fontconfig glib2 libpng pixman zlib +CAIRO_CONF_OPTS = \ + --with-html-dir=$(REMOVE_htmldir) \ + --with-x=no \ + --disable-xlib \ + --disable-xcb \ + --disable-egl \ + --disable-glesv2 \ + --disable-gl \ + --enable-tee cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(CAIRO_DIR) - $(UNTAR)/$(CAIRO_SOURCE) - $(CHDIR)/$(CAIRO_DIR); \ - $(call apply_patches,$(CAIRO_PATCH)); \ - $(MAKE_ENV) \ - ax_cv_c_float_words_bigendian="no" \ - ./configure $(CONFIGURE_OPTS) \ - --prefix=$(prefix) \ - --with-x=no \ - --disable-xlib \ - --disable-xcb \ - --disable-egl \ - --disable-glesv2 \ - --disable-gl \ - --enable-tee \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_bindir)/cairo-sphinx @@ -158,8 +129,8 @@ cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR) rm -rf $(TARGET_libdir)/cairo/cairo-sphinx* rm -rf $(TARGET_libdir)/cairo/.debug/cairo-fdr* rm -rf $(TARGET_libdir)/cairo/.debug/cairo-sphinx* - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(CAIRO_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -172,27 +143,26 @@ HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release $(DL_DIR)/$(HARFBUZZ_SOURCE): $(DOWNLOAD) $(HARFBUZZ_SITE)/$(HARFBUZZ_SOURCE) -HARFBUZZ_PATCH = harfbuzz-disable-docs.patch +HARFBUZZ_DEPS = fontconfig glib2 cairo freetype + +HARFBUZZ_AUTORECONF = YES -HARFBUZZ_DEPS = fontconfig glib2 cairo freetype +HARFBUZZ_CONF_OPTS = \ + --with-cairo \ + --with-fontconfig \ + --with-freetype \ + --with-glib \ + --without-graphite2 \ + --without-icu harfbuzz: $(HARFBUZZ_DEPS) $(DL_DIR)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(HARFBUZZ_DIR) - $(UNTAR)/$(HARFBUZZ_SOURCE) - $(CHDIR)/$(HARFBUZZ_DIR); \ - $(call apply_patches,$(HARFBUZZ_PATCH)); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --with-cairo \ - --with-fontconfig \ - --with-freetype \ - --with-glib \ - --without-graphite2 \ - --without-icu \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(HARFBUZZ_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) diff --git a/make/target-libs.mk b/make/target-libs.mk index 90d7bb50..0607c462 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -11,24 +11,24 @@ ZLIB_SITE = https://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VER) $(DL_DIR)/$(ZLIB_SOURCE): $(DOWNLOAD) $(ZLIB_SITE)/$(ZLIB_SOURCE) -ZLIB_PATCH = zlib-ldflags-tests.patch -ZLIB_PATCH += zlib-remove.ldconfig.call.patch +ZLIB_CONF_ENV = \ + mandir=$(REMOVE_mandir) + +ZLIB_CONF_OPTS = \ + --prefix=$(prefix) \ + --shared \ + --uname=Linux zlib: $(DL_DIR)/$(ZLIB_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(ZLIB_DIR) - $(UNTAR)/$(ZLIB_SOURCE) - $(CHDIR)/$(ZLIB_DIR); \ - $(call apply_patches,$(ZLIB_PATCH)); \ - $(MAKE_ENV) \ - mandir=$(REMOVE_mandir) \ - ./configure \ - --prefix=$(prefix) \ - --shared \ - --uname=Linux \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(TARGET_CONFIGURE_ENV) \ + ./configure $($(PKG)_CONF_OPTS); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(ZLIB_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -41,27 +41,27 @@ LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIB $(DL_DIR)/$(LIBFUSE_SOURCE): $(DOWNLOAD) $(LIBFUSE_SITE)/$(LIBFUSE_SOURCE) +LIBFUSE_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + --disable-static \ + --disable-example \ + --disable-mtab \ + --with-gnu-ld \ + --enable-util \ + --enable-lib \ + --enable-silent-rules + libfuse: $(DL_DIR)/$(LIBFUSE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBFUSE_DIR) - $(UNTAR)/$(LIBFUSE_SOURCE) - $(CHDIR)/$(LIBFUSE_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --disable-static \ - --disable-example \ - --disable-mtab \ - --with-gnu-ld \ - --enable-util \ - --enable-lib \ - --enable-silent-rules \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - rm -rf $(TARGET_sysconfdir)/udev - rm -rf $(TARGET_sysconfdir)/init.d/fuse - $(REMOVE)/$(LIBFUSE_DIR) + $(REWRITE_LIBTOOL) + -rm -r $(TARGET_sysconfdir)/udev + -rm $(TARGET_sysconfdir)/init.d/fuse + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -74,19 +74,19 @@ LIBUPNP_SITE = http://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%20$(L $(DL_DIR)/$(LIBUPNP_SOURCE): $(DOWNLOAD) $(LIBUPNP_SITE)/$(LIBUPNP_SOURCE) +LIBUPNP_CONV_OPTS = \ + --enable-shared \ + --disable-static + libupnp: $(DL_DIR)/$(LIBUPNP_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBUPNP_DIR) - $(UNTAR)/$(LIBUPNP_SOURCE) - $(CHDIR)/$(LIBUPNP_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-shared \ - --disable-static \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBUPNP_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -96,24 +96,22 @@ LIBDVBSI_DIR = libdvbsi.$(LIBDVBSI_VER) LIBDVBSI_SOURCE = libdvbsi.$(LIBDVBSI_VER) LIBDVBSI_SITE = https://github.com/OpenVisionE2 -LIBDVBSI_PATCH = libdvbsi++-content_identifier_descriptor.patch +LIBDVBSI_CONV_OPTS = \ + --enable-silent-rules \ + --enable-shared \ + --disable-static libdvbsi: | $(TARGET_DIR) - $(REMOVE)/$(LIBDVBSI_DIR) - $(GET-GIT-SOURCE) $(LIBDVBSI_SITE)/$(LIBDVBSI_SOURCE) $(DL_DIR)/$(LIBDVBSI_SOURCE) - $(CPDIR)/$(LIBDVBSI_SOURCE) - $(CHDIR)/$(LIBDVBSI_DIR); \ - $(call apply_patches,$(LIBDVBSI_PATCH)); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-shared \ - --enable-silent-rules \ - --disable-static \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBDVBSI_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -123,19 +121,18 @@ LIBDVBCSA_DIR = libdvbcsa.$(LIBDVBCSA_VER) LIBDVBCSA_SOURCE = libdvbcsa.$(LIBDVBCSA_VER) LIBDVBCSA_SITE = https://code.videolan.org/videolan +LIBDVBCSA_AUTORECONF = YES + libdvbcsa: | $(TARGET_DIR) - $(REMOVE)/$(LIBDVBCSA_DIR) - $(GET-GIT-SOURCE) $(LIBDVBCSA_SITE)/$(LIBDVBCSA_SOURCE) $(DL_DIR)/$(LIBDVBCSA_SOURCE) - $(CPDIR)/$(LIBDVBCSA_SOURCE) - $(CHDIR)/$(LIBDVBCSA_DIR); \ - ./bootstrap; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBDVBCSA_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -149,13 +146,13 @@ $(DL_DIR)/$(GIFLIB_SOURCE): $(DOWNLOAD) $(GIFLIB_SITE)/$(GIFLIB_SOURCE) giflib: $(DL_DIR)/$(GIFLIB_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(GIFLIB_DIR) - $(UNTAR)/$(GIFLIB_SOURCE) - $(CHDIR)/$(GIFLIB_DIR); \ - $(MAKE_ENV) \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(TARGET_CONFIGURE_ENV) \ $(MAKE); \ $(MAKE) install-include install-lib DESTDIR=$(TARGET_DIR) PREFIX=$(prefix) - $(REMOVE)/$(GIFLIB_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -168,47 +165,44 @@ LIBCURL_SITE = https://curl.haxx.se/download $(DL_DIR)/$(LIBCURL_SOURCE): $(DOWNLOAD) $(LIBCURL_SITE)/$(LIBCURL_SOURCE) -LIBCURL_DEPS = zlib openssl rtmpdump ca-bundle - -LIBCURL_CONF = $(if $(filter $(BOXSERIES),hd1),--disable-ipv6,--enable-ipv6) +LIBCURL_DEPS = zlib openssl rtmpdump ca-bundle + +LIBCURL_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + $(if $(filter $(BOXSERIES),hd1),--disable-ipv6,--enable-ipv6) \ + --disable-manual \ + --disable-file \ + --disable-rtsp \ + --disable-dict \ + --disable-ldap \ + --disable-curldebug \ + --disable-static \ + --disable-imap \ + --disable-gopher \ + --disable-pop3 \ + --disable-smtp \ + --disable-verbose \ + --disable-manual \ + --disable-ntlm-wb \ + --disable-ares \ + --without-libidn \ + --with-ca-bundle=$(CA_BUNDLE_DIR)/$(CA_BUNDLE_CRT) \ + --with-random=/dev/urandom \ + --with-ssl=$(TARGET_prefix) \ + --with-librtmp=$(TARGET_libdir) \ + --enable-optimize libcurl: $(LIBCURL_DEPS) $(DL_DIR)/$(LIBCURL_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBCURL_DIR) - $(UNTAR)/$(LIBCURL_SOURCE) - $(CHDIR)/$(LIBCURL_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --disable-manual \ - --disable-file \ - --disable-rtsp \ - --disable-dict \ - --disable-ldap \ - --disable-curldebug \ - --disable-static \ - --disable-imap \ - --disable-gopher \ - --disable-pop3 \ - --disable-smtp \ - --disable-verbose \ - --disable-manual \ - --disable-ntlm-wb \ - --disable-ares \ - --without-libidn \ - --with-ca-bundle=$(CA-BUNDLE_DIR)/$(CA-BUNDLE) \ - --with-random=/dev/urandom \ - --with-ssl=$(TARGET_prefix) \ - --with-librtmp=$(TARGET_libdir) \ - --enable-optimize \ - $(LIBCURL_CONF) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mv $(TARGET_bindir)/curl-config $(HOST_DIR)/bin/ $(REWRITE_CONFIG) $(HOST_DIR)/bin/curl-config - rm -f $(TARGET_datadir)/zsh - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBCURL_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -221,30 +215,25 @@ LIBPNG_SITE = https://sourceforge.net/projects/libpng/files/libpng16/$(LIBPNG_ $(DL_DIR)/$(LIBPNG_SOURCE): $(DOWNLOAD) $(LIBPNG_SITE)/$(LIBPNG_SOURCE) -LIBPNG_PATCH = libpng-Disable-pngfix-and-png-fix-itxt.patch - -LIBPNG_DEPS = zlib +LIBPNG_DEPS = zlib -LIBPNG_CONF = $(if $(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse),--enable-arm-neon,--disable-arm-neon) +LIBPNG_CONF_OPTS = \ + --enable-silent-rules \ + --disable-static \ + $(if $(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse),--enable-arm-neon,--disable-arm-neon) libpng: $(LIBPNG_DEPS) $(DL_DIR)/$(LIBPNG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBPNG_DIR) - $(UNTAR)/$(LIBPNG_SOURCE) - $(CHDIR)/$(LIBPNG_DIR); \ - $(call apply_patches,$(LIBPNG_PATCH)); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --enable-silent-rules \ - --disable-static \ - $(LIBPNG_CONF) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mv $(TARGET_bindir)/libpng*-config $(HOST_DIR)/bin/ $(REWRITE_CONFIG) $(HOST_DIR)/bin/libpng16-config - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBPNG_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -257,69 +246,63 @@ FREETYPE_SITE = https://sourceforge.net/projects/freetype/files/freetype2/$(FR $(DL_DIR)/$(FREETYPE_SOURCE): $(DOWNLOAD) $(FREETYPE_SITE)/$(FREETYPE_SOURCE) -FREETYPE_PATCH = freetype2-subpixel.patch -FREETYPE_PATCH += freetype2-config.patch -FREETYPE_PATCH += freetype2-pkgconf.patch +FREETYPE_DEPS = zlib libpng -FREETYPE_DEPS = zlib libpng +FREETYPE_CONF_OPTS = \ + --enable-shared \ + --disable-static \ + --enable-freetype-config \ + --with-png \ + --with-zlib \ + --without-harfbuzz \ + --without-bzip2 freetype: $(FREETYPE_DEPS) $(DL_DIR)/$(FREETYPE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FREETYPE_DIR) - $(UNTAR)/$(FREETYPE_SOURCE) - $(CHDIR)/$(FREETYPE_DIR); \ - $(call apply_patches,$(FREETYPE_PATCH)); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ $(SED) '/^FONT_MODULES += \(type1\|cid\|pfr\|type42\|pcf\|bdf\|winfonts\|cff\)/d' modules.cfg - $(CHDIR)/$(FREETYPE_DIR)/builds/unix; \ + $(CHDIR)/$(PKG_DIR)/builds/unix; \ libtoolize --force --copy; \ aclocal -I .; \ autoconf - $(CHDIR)/$(FREETYPE_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --enable-shared \ - --disable-static \ - --enable-freetype-config \ - --with-png \ - --with-zlib \ - --without-harfbuzz \ - --without-bzip2 \ - ; \ + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) ln -sf freetype2 $(TARGET_includedir)/freetype mv $(TARGET_bindir)/freetype-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/freetype-config - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(FREETYPE_DIR) \ + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) \ $(TARGET_datadir)/aclocal $(TOUCH) # ----------------------------------------------------------------------------- -LIBJPEG-TURBO_VER = 2.0.6 -LIBJPEG-TURBO_DIR = libjpeg-turbo-$(LIBJPEG-TURBO_VER) -LIBJPEG-TURBO_SOURCE = libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz -LIBJPEG-TURBO_SITE = https://sourceforge.net/projects/libjpeg-turbo/files/$(LIBJPEG-TURBO_VER) - -$(DL_DIR)/$(LIBJPEG-TURBO_SOURCE): - $(DOWNLOAD) $(LIBJPEG-TURBO_SITE)/$(LIBJPEG-TURBO_SOURCE) - -LIBJPEG-TURBO_PATCH = libjpeg-turbo-tiff-ojpeg.patch - -libjpeg-turbo: $(DL_DIR)/$(LIBJPEG-TURBO_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBJPEG-TURBO_DIR) - $(UNTAR)/$(LIBJPEG-TURBO_SOURCE) - $(CHDIR)/$(LIBJPEG-TURBO_DIR); \ - $(call apply_patches,$(LIBJPEG-TURBO_PATCH)); \ - $(CMAKE) \ - -DWITH_SIMD=False \ - -DWITH_JPEG8=80 \ - ; \ +LIBJPEG_TURBO_VER = 2.0.6 +LIBJPEG_TURBO_DIR = libjpeg-turbo-$(LIBJPEG_TURBO_VER) +LIBJPEG_TURBO_SOURCE = libjpeg-turbo-$(LIBJPEG_TURBO_VER).tar.gz +LIBJPEG_TURBO_SITE = https://sourceforge.net/projects/libjpeg-turbo/files/$(LIBJPEG_TURBO_VER) + +$(DL_DIR)/$(LIBJPEG_TURBO_SOURCE): + $(DOWNLOAD) $(LIBJPEG_TURBO_SITE)/$(LIBJPEG_TURBO_SOURCE) + +LIBJPEG_TURBO_CONF_OPTS = \ + -DWITH_SIMD=False \ + -DWITH_JPEG8=80 + +libjpeg-turbo: $(DL_DIR)/$(LIBJPEG_TURBO_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CMAKE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -f $(addprefix $(TARGET_bindir)/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) - $(REMOVE)/$(LIBJPEG-TURBO_DIR) + -rm $(addprefix $(TARGET_bindir)/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -332,40 +315,42 @@ OPENSSL_SITE = https://www.openssl.org/source $(DL_DIR)/$(OPENSSL_SOURCE): $(DOWNLOAD) $(OPENSSL_SITE)/$(OPENSSL_SOURCE) -OPENSSL_PATCH = 0000-Configure-align-O-flag.patch - ifeq ($(TARGET_ARCH),arm) - OPENSSL_ARCH = linux-armv4 + OPENSSL_TARGET_ARCH = linux-armv4 else ifeq ($(TARGET_ARCH),mips) - OPENSSL_ARCH = linux-generic32 + OPENSSL_TARGET_ARCH = linux-generic32 endif +OPENSSL_CONV_OPTS = \ + --cross-compile-prefix=$(TARGET_CROSS) \ + --prefix=$(prefix) \ + --openssldir=$(sysconfdir)/ssl + +OPENSSL_CONV_OPTS += \ + $(OPENSSL_TARGET_ARCH) \ + shared \ + threads \ + no-hw \ + no-engine \ + no-sse2 \ + no-perlasm \ + no-tests \ + no-fuzz-afl \ + no-fuzz-libfuzzer + +OPENSSL_CONV_OPTS += \ + -DTERMIOS -fomit-frame-pointer \ + -DOPENSSL_SMALL_FOOTPRINT \ + $(TARGET_CFLAGS) \ + $(TARGET_LDFLAGS) \ + openssl: $(DL_DIR)/$(OPENSSL_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(OPENSSL_DIR) - $(UNTAR)/$(OPENSSL_SOURCE) - $(CHDIR)/$(OPENSSL_DIR); \ - $(call apply_patches,$(addprefix $(@F)/,$(OPENSSL_PATCH))); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ ./Configure \ - $(OPENSSL_ARCH) \ - shared \ - threads \ - no-hw \ - no-engine \ - no-sse2 \ - no-perlasm \ - no-tests \ - no-fuzz-afl \ - no-fuzz-libfuzzer \ - \ - $(TARGET_CFLAGS) \ - -DTERMIOS -fomit-frame-pointer \ - -DOPENSSL_SMALL_FOOTPRINT \ - $(TARGET_LDFLAGS) \ - \ - --cross-compile-prefix=$(TARGET_CROSS) \ - --prefix=$(prefix)/ \ - --openssldir=/etc/ssl \ - ; \ + $($(PKG)_CONV_OPTS); \ $(SED) 's| build_tests||' Makefile; \ $(SED) 's|^MANDIR=.*|MANDIR=$(REMOVE_mandir)|' Makefile; \ $(SED) 's|^HTMLDIR=.*|HTMLDIR=$(REMOVE_htmldir)|' Makefile; \ @@ -384,7 +369,7 @@ endif ln -sf libcrypto.so.1.0.0 $(TARGET_libdir)/libcrypto.so.$$version; \ ln -sf libssl.so.1.0.0 $(TARGET_libdir)/libssl.so.$$version; \ done - $(REMOVE)/$(OPENSSL_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -397,53 +382,51 @@ NCURSES_SITE = $(GNU_MIRROR)/ncurses $(DL_DIR)/$(NCURSES_SOURCE): $(DOWNLOAD) $(NCURSES_SITE)/$(NCURSES_SOURCE) -NCURSES_PATCH = ncurses-gcc-5.x-MKlib_gen.patch +NCURSES_CONF_OPTS = \ + --enable-pc-files \ + --with-pkg-config \ + --with-pkg-config-libdir=$(libdir)/pkgconfig \ + --with-shared \ + --with-fallbacks='linux vt100 xterm' \ + --disable-big-core \ + --without-manpages \ + --without-progs \ + --without-tests \ + --without-debug \ + --without-ada \ + --without-profile \ + --without-cxx-binding ncurses: $(DL_DIR)/$(NCURSES_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(NCURSES_DIR) - $(UNTAR)/$(NCURSES_SOURCE) - $(CHDIR)/$(NCURSES_DIR); \ - $(call apply_patches,$(NCURSES_PATCH)); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-pc-files \ - --with-pkg-config \ - --with-pkg-config-libdir=$(libdir)/pkgconfig \ - --with-shared \ - --with-fallbacks='linux vt100 xterm' \ - --disable-big-core \ - --without-manpages \ - --without-progs \ - --without-tests \ - --without-debug \ - --without-ada \ - --without-profile \ - --without-cxx-binding \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE) libs; \ $(MAKE) install.libs DESTDIR=$(TARGET_DIR) - rm -f $(addprefix $(TARGET_libdir)/,libform* libmenu* libpanel*) - rm -f $(addprefix $(TARGET_libdir)/pkgconfig/,form.pc menu.pc panel.pc) - rm -f $(HOST_DIR)/bin/ncurses* + -rm $(addprefix $(TARGET_libdir)/,libform* libmenu* libpanel*) + -rm $(addprefix $(TARGET_libdir)/pkgconfig/,form.pc menu.pc panel.pc) mv $(TARGET_bindir)/ncurses6-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/ncurses6-config - $(REMOVE)/$(NCURSES_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -openthreads: $(SOURCE_DIR)/$(NI-OPENTHREADS) | $(TARGET_DIR) - $(REMOVE)/$(NI-OPENTHREADS) - tar -C $(SOURCE_DIR) -cp $(NI-OPENTHREADS) --exclude-vcs | tar -C $(BUILD_DIR) -x - $(CHDIR)/$(NI-OPENTHREADS)/; \ - $(CMAKE) \ - -DCMAKE_SUPPRESS_DEVELOPER_WARNINGS="1" \ - -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE="0" \ - ; \ +OPENTHREADS_CONF_OPTS = \ + -DCMAKE_SUPPRESS_DEVELOPER_WARNINGS="1" \ + -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE="0" \ + -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE__TRYRUN_OUTPUT="1" + +openthreads: $(SOURCE_DIR)/$(NI_OPENTHREADS) | $(TARGET_DIR) + $(REMOVE)/$(NI_OPENTHREADS) + tar -C $(SOURCE_DIR) -cp $(NI_OPENTHREADS) --exclude-vcs | tar -C $(BUILD_DIR) -x + $(CHDIR)/$(NI_OPENTHREADS)/; \ + $(CMAKE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -f $(TARGET_libdir)/cmake - $(REMOVE)/$(NI-OPENTHREADS) + $(REMOVE)/$(NI_OPENTHREADS) $(TOUCH) # ----------------------------------------------------------------------------- @@ -456,48 +439,44 @@ LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VER $(DL_DIR)/$(LIBUSB_SOURCE): $(DOWNLOAD) $(LIBUSB_SITE)/$(LIBUSB_SOURCE) +LIBUSB_CONF_OPTS = \ + --disable-udev + libusb: $(DL_DIR)/$(LIBUSB_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBUSB_DIR) - $(UNTAR)/$(LIBUSB_SOURCE) - $(CHDIR)/$(LIBUSB_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --disable-udev \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR); \ - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBUSB_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -LIBUSB-COMPAT_VER = 0.1.7 -LIBUSB-COMPAT_DIR = libusb-compat-$(LIBUSB-COMPAT_VER) -LIBUSB-COMPAT_SOURCE = libusb-compat-$(LIBUSB-COMPAT_VER).tar.bz2 -LIBUSB-COMPAT_SITE = https://github.com/libusb/libusb-compat-0.1/releases/download/v$(LIBUSB-COMPAT_VER) - -$(DL_DIR)/$(LIBUSB-COMPAT_SOURCE): - $(DOWNLOAD) $(LIBUSB-COMPAT_SITE)/$(LIBUSB-COMPAT_SOURCE) +LIBUSB_COMPAT_VER = 0.1.7 +LIBUSB_COMPAT_DIR = libusb-compat-$(LIBUSB_COMPAT_VER) +LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VER).tar.bz2 +LIBUSB_COMPAT_SITE = https://github.com/libusb/libusb-compat-0.1/releases/download/v$(LIBUSB_COMPAT_VER) -LIBUSB-COMPAT_PATCH = 0001-fix-a-build-issue-on-linux.patch +$(DL_DIR)/$(LIBUSB_COMPAT_SOURCE): + $(DOWNLOAD) $(LIBUSB_COMPAT_SITE)/$(LIBUSB_COMPAT_SOURCE) -LUBUSB-COMPAT_DEPS = libusb +LIBUSB_COMPAT_DEPS = libusb -libusb-compat: $(LUBUSB-COMPAT_DEPS) $(DL_DIR)/$(LIBUSB-COMPAT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBUSB-COMPAT_DIR) - $(UNTAR)/$(LIBUSB-COMPAT_SOURCE) - $(CHDIR)/$(LIBUSB-COMPAT_DIR); \ - $(call apply_patches,$(addprefix $(@F)/,$(LIBUSB-COMPAT_PATCH))); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - ; \ +libusb-compat: $(LIBUSB_COMPAT_DEPS) $(DL_DIR)/$(LIBUSB_COMPAT_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR); \ mv $(TARGET_bindir)/libusb-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/libusb-config - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBUSB-COMPAT_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -510,24 +489,23 @@ LIBGD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(LIBGD_VER) $(DL_DIR)/$(LIBGD_SOURCE): $(DOWNLOAD) $(LIBGD_SITE)/$(LIBGD_SOURCE) -LIBGD_DEPS = zlib libpng libjpeg-turbo freetype +LIBGD_DEPS = zlib libpng libjpeg-turbo freetype + +LIBGD_CONF_OPTS = \ + --bindir=$(REMOVE_bindir) \ + --without-fontconfig \ + --without-xpm \ + --without-x libgd: $(LIBGD_DEPS) $(DL_DIR)/$(LIBGD_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBGD_DIR) - $(UNTAR)/$(LIBGD_SOURCE) - $(CHDIR)/$(LIBGD_DIR); \ - ./bootstrap.sh; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --bindir=$(REMOVE_bindir) \ - --without-fontconfig \ - --without-xpm \ - --without-x \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBGD_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -537,23 +515,23 @@ LIBDPF_DIR = dpf-ax.$(LIBDPF_VER) LIBDPF_SOURCE = dpf-ax.$(LIBDPF_VER) LIBDPF_SITE = $(GITHUB)/MaxWiesel -LIBDPF_PATCH = libdpf-crossbuild.patch +LIBDPF_DEPS = libusb-compat -LIBDPF_DEPS = libusb-compat +LIBDPF_MAKE_OPTS = \ + CC=$(TARGET_CC) PREFIX=$(TARGET_prefix) libdpf: $(LIBDPF_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(LIBDPF_DIR) - $(GET-GIT-SOURCE) $(LIBDPF_SITE)/$(LIBDPF_SOURCE) $(DL_DIR)/$(LIBDPF_SOURCE) - $(CPDIR)/$(LIBDPF_SOURCE) - $(CHDIR)/$(LIBDPF_DIR)/dpflib; \ - $(call apply_patches,$(LIBDPF_PATCH)); \ - make libdpf.a CC=$(TARGET_CC) PREFIX=$(TARGET_prefix); \ - mkdir -p $(TARGET_includedir)/libdpf; \ - cp dpf.h $(TARGET_includedir)/libdpf/libdpf.h; \ - cp ../include/spiflash.h $(TARGET_includedir)/libdpf/; \ - cp ../include/usbuser.h $(TARGET_includedir)/libdpf/; \ - cp libdpf.a $(TARGET_libdir)/ - $(REMOVE)/$(LIBDPF_DIR) + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(MAKE1) -C dpflib libdpf.a $($(PKG)_MAKE_OPTS) + $(INSTALL_DATA) -D $(PKG_BUILD_DIR)/dpflib/libdpf.a $(TARGET_libdir)/libdpf.a + $(INSTALL_DATA) -D $(PKG_BUILD_DIR)/dpflib/dpf.h $(TARGET_includedir)/libdpf/libdpf.h + $(INSTALL_DATA) -D $(PKG_BUILD_DIR)/include/spiflash.h $(TARGET_includedir)/libdpf/spiflash.h + $(INSTALL_DATA) -D $(PKG_BUILD_DIR)/include/usbuser.h $(TARGET_includedir)/libdpf/usbuser.h + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -567,18 +545,14 @@ $(DL_DIR)/$(LZO_SOURCE): $(DOWNLOAD) $(LZO_SITE)/$(LZO_SOURCE) lzo: $(DL_DIR)/$(LZO_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LZO_DIR) - $(UNTAR)/$(LZO_SOURCE) - $(CHDIR)/$(LZO_DIR); \ - $(CONFIGURE) \ - --mandir=$(REMOVE_mandir) \ - --docdir=$(REMOVE_docdir) \ - --prefix=$(prefix) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LZO_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -591,21 +565,23 @@ LIBSIGC_SITE = https://download.gnome.org/sources/libsigc++/$(basename $(LIBSI $(DL_DIR)/$(LIBSIGC_SOURCE): $(DOWNLOAD) $(LIBSIGC_SITE)/$(LIBSIGC_SOURCE) +LIBSIGC_CONF_OPTS = \ + --disable-benchmark \ + --disable-documentation \ + --disable-warnings \ + --without-boost + libsigc: $(DL_DIR)/$(LIBSIGC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBSIGC_DIR) - $(UNTAR)/$(LIBSIGC_SOURCE) - $(CHDIR)/$(LIBSIGC_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --disable-documentation \ - --enable-silent-rules \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR); \ cp sigc++config.h $(TARGET_includedir) ln -sf ./sigc++-2.0/sigc++ $(TARGET_includedir)/sigc++ - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBSIGC_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -618,26 +594,23 @@ EXPAT_SITE = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_VER) $(DL_DIR)/$(EXPAT_SOURCE): $(DOWNLOAD) $(EXPAT_SITE)/$(EXPAT_SOURCE) -EXPAT_PATCH = expat-libtool-tag.patch +EXPAT_AUTORECONF = YES + +EXPAT_CONF_OPTS = \ + --docdir=$(REMOVE_docdir) \ + --without-xmlwf \ + --without-docbook expat: $(DL_DIR)/$(EXPAT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(EXPAT_DIR) - $(UNTAR)/$(EXPAT_SOURCE) - $(CHDIR)/$(EXPAT_DIR); \ - $(call apply_patches,$(EXPAT_PATCH)); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --docdir=$(REMOVE_docdir) \ - --mandir=$(REMOVE_mandir) \ - --enable-shared \ - --disable-static \ - --without-xmlwf \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(EXPAT_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -650,39 +623,36 @@ LIBBLURAY_SITE = ftp.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VER) $(DL_DIR)/$(LIBBLURAY_SOURCE): $(DOWNLOAD) $(LIBBLURAY_SITE)/$(LIBBLURAY_SOURCE) -LIBBLURAY_PATCH = libbluray.patch - -LIBBLURAY_DEPS = freetype +LIBBLURAY_DEPS = freetype ifeq ($(BOXSERIES),hd2) LIBBLURAY_DEPS += libaacs libbdplus endif +LIBBLURAY_CONF_OPTS = \ + --enable-shared \ + --disable-static \ + --disable-extra-warnings \ + --disable-doxygen-doc \ + --disable-doxygen-dot \ + --disable-doxygen-html \ + --disable-doxygen-ps \ + --disable-doxygen-pdf \ + --disable-examples \ + --disable-bdjava \ + --without-libxml2 \ + --without-fontconfig + libbluray: $(LIBBLURAY_DEPS) $(DL_DIR)/$(LIBBLURAY_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBBLURAY_DIR) - $(UNTAR)/$(LIBBLURAY_SOURCE) - $(CHDIR)/$(LIBBLURAY_DIR); \ - $(call apply_patches,$(LIBBLURAY_PATCH)); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ ./bootstrap; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-shared \ - --disable-static \ - --disable-extra-warnings \ - --disable-doxygen-doc \ - --disable-doxygen-dot \ - --disable-doxygen-html \ - --disable-doxygen-ps \ - --disable-doxygen-pdf \ - --disable-examples \ - --disable-bdjava \ - --without-libxml2 \ - --without-fontconfig \ - $(BLURAY_CONFIGURE) \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBBLURAY_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -695,64 +665,64 @@ LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VER) $(DL_DIR)/$(LIBASS_SOURCE): $(DOWNLOAD) $(LIBASS_SITE)/$(LIBASS_SOURCE) -LIBASS_PATCH = libass.patch +LIBASS_DEPS = freetype fribidi -LIBASS_DEPS = freetype fribidi +LIBASS_CONF_OPTS = \ + --disable-static \ + --disable-test \ + --disable-fontconfig \ + --disable-harfbuzz \ + --disable-require-system-font-provider libass: $(LIBASS_DEPS) $(DL_DIR)/$(LIBASS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBASS_DIR) - $(UNTAR)/$(LIBASS_SOURCE) - $(CHDIR)/$(LIBASS_DIR); \ - $(call apply_patches,$(LIBASS_PATCH)); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --disable-static \ - --disable-test \ - --disable-fontconfig \ - --disable-harfbuzz \ - --disable-require-system-font-provider \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBASS_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -LIBGPG-ERROR_VER = 1.37 -LIBGPG-ERROR_DIR = libgpg-error-$(LIBGPG-ERROR_VER) -LIBGPG-ERROR_SOURCE = libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 -LIBGPG-ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error - -$(DL_DIR)/$(LIBGPG-ERROR_SOURCE): - $(DOWNLOAD) $(LIBGPG-ERROR_SITE)/$(LIBGPG-ERROR_SOURCE) - -libgpg-error: $(DL_DIR)/$(LIBGPG-ERROR_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBGPG-ERROR_DIR) - $(UNTAR)/$(LIBGPG-ERROR_SOURCE) - $(CHDIR)/$(LIBGPG-ERROR_DIR); \ +LIBGPG_ERROR_VER = 1.37 +LIBGPG_ERROR_DIR = libgpg-error-$(LIBGPG_ERROR_VER) +LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VER).tar.bz2 +LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error + +$(DL_DIR)/$(LIBGPG_ERROR_SOURCE): + $(DOWNLOAD) $(LIBGPG_ERROR_SITE)/$(LIBGPG_ERROR_SOURCE) + +LIBGPG_ERROR_AUTORECONF = YES + +LIBGPG_ERROR_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + --enable-maintainer-mode \ + --enable-shared \ + --disable-doc \ + --disable-languages \ + --disable-static \ + --disable-tests + +libgpg-error: $(DL_DIR)/$(LIBGPG_ERROR_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ pushd src/syscfg; \ ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h lock-obj-pub.$(TARGET).h; \ ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h lock-obj-pub.linux-uclibcgnueabi.h; \ popd; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --enable-maintainer-mode \ - --enable-shared \ - --disable-doc \ - --disable-languages \ - --disable-static \ - --disable-tests \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mv $(TARGET_bindir)/gpg-error-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/gpg-error-config - $(REWRITE_LIBTOOL_LA) - rm -f $(addprefix $(TARGET_bindir)/,gpg-error gpgrt-config) - $(REMOVE)/$(LIBGPG-ERROR_DIR) + $(REWRITE_LIBTOOL) + -rm $(addprefix $(TARGET_bindir)/,gpg-error gpgrt-config) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -765,30 +735,28 @@ LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt $(DL_DIR)/$(LIBGCRYPT_SOURCE): $(DOWNLOAD) $(LIBGCRYPT_SITE)/$(LIBGCRYPT_SOURCE) -LIBGCRYPT_DEPS = libgpg-error +LIBGCRYPT_DEPS = libgpg-error + +LIBGCRYPT_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + --enable-maintainer-mode \ + --enable-silent-rules \ + --enable-shared \ + --disable-static \ + --disable-tests libgcrypt: $(LIBGCRYPT_DEPS) $(DL_DIR)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBGCRYPT_DIR) - $(UNTAR)/$(LIBGCRYPT_SOURCE) - $(CHDIR)/$(LIBGCRYPT_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --enable-maintainer-mode \ - --enable-silent-rules \ - --enable-shared \ - --disable-static \ - --disable-tests \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mv $(TARGET_bindir)/libgcrypt-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/libgcrypt-config - $(REWRITE_LIBTOOL_LA) - rm -rf $(TARGET_bindir)/dumpsexp - rm -rf $(TARGET_bindir)/hmac256 - rm -rf $(TARGET_bindir)/mpicalc - $(REMOVE)/$(LIBGCRYPT_DIR) + $(REWRITE_LIBTOOL) + -rm $(addprefix $(TARGET_bindir)/,dumpsexp hmac256 mpicalc) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -801,27 +769,27 @@ LIBAACS_SITE = ftp://ftp.videolan.org/pub/videolan/libaacs/$(LIBAACS_VER) $(DL_DIR)/$(LIBAACS_SOURCE): $(DOWNLOAD) $(LIBAACS_SITE)/$(LIBAACS_SOURCE) -LIBAACS_DEPS = libgcrypt +LIBAACS_DEPS = libgcrypt + +LIBAACS_CONF_OPTS = \ + --enable-maintainer-mode \ + --enable-silent-rules \ + --enable-shared \ + --disable-static libaacs: $(LIBAACS_DEPS) $(DL_DIR)/$(LIBAACS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBAACS_DIR) - $(UNTAR)/$(LIBAACS_SOURCE) - $(CHDIR)/$(LIBAACS_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ ./bootstrap; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-maintainer-mode \ - --enable-silent-rules \ - --enable-shared \ - --disable-static \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) + $(REWRITE_LIBTOOL) $(CD) $(TARGET_DIR); \ mkdir -p .config/aacs .cache/aacs/vuk cp $(TARGET_FILES)/libaacs/KEYDB.cfg $(TARGET_DIR)/.config/aacs - $(REMOVE)/$(LIBAACS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -834,27 +802,27 @@ LIBBDPLUS_SITE = ftp://ftp.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VER $(DL_DIR)/$(LIBBDPLUS_SOURCE): $(DOWNLOAD) $(LIBBDPLUS_SITE)/$(LIBBDPLUS_SOURCE) -LIBBDPLUS_DEPS = libaacs +LIBBDPLUS_DEPS = libaacs + +LIBBDPLUS_CONF_OPTS = \ + --enable-maintainer-mode \ + --enable-silent-rules \ + --enable-shared \ + --disable-static libbdplus: $(LIBBDPLUS_DEPS) $(DL_DIR)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBBDPLUS_DIR) - $(UNTAR)/$(LIBBDPLUS_SOURCE) - $(CHDIR)/$(LIBBDPLUS_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ ./bootstrap; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-maintainer-mode \ - --enable-silent-rules \ - --enable-shared \ - --disable-static \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) + $(REWRITE_LIBTOOL) $(CD) $(TARGET_DIR); \ mkdir -p .config/bdplus/vm0 cp -f $(TARGET_FILES)/libbdplus/* $(TARGET_DIR)/.config/bdplus/vm0 - $(REMOVE)/$(LIBBDPLUS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -867,34 +835,34 @@ LIBXML2_SITE = http://xmlsoft.org/sources $(DL_DIR)/$(LIBXML2_SOURCE): $(DOWNLOAD) $(LIBXML2_SITE)/$(LIBXML2_SOURCE) +LIBXML2_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + --enable-shared \ + --disable-static \ + --without-python \ + --without-debug \ + --without-c14n \ + --without-legacy \ + --without-catalog \ + --without-docbook \ + --without-mem-debug \ + --without-lzma \ + --without-schematron + libxml2: $(DL_DIR)/$(LIBXML2_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBXML2_DIR) - $(UNTAR)/$(LIBXML2_SOURCE) - $(CHDIR)/$(LIBXML2_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-shared \ - --disable-static \ - --datarootdir=$(REMOVE_datarootdir) \ - --without-python \ - --without-debug \ - --without-c14n \ - --without-legacy \ - --without-catalog \ - --without-docbook \ - --without-mem-debug \ - --without-lzma \ - --without-schematron \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mv $(TARGET_bindir)/xml2-config $(HOST_DIR)/bin $(REWRITE_CONFIG) $(HOST_DIR)/bin/xml2-config - $(REWRITE_LIBTOOL_LA) - rm -rf $(TARGET_libdir)/xml2Conf.sh - rm -rf $(TARGET_libdir)/cmake - $(REMOVE)/$(LIBXML2_DIR) + $(REWRITE_LIBTOOL) + -rm -r $(TARGET_libdir)/cmake + -rm $(addprefix $(TARGET_libdir)/,xml2Conf.sh) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -907,18 +875,16 @@ PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VE $(DL_DIR)/$(PUGIXML_SOURCE): $(DOWNLOAD) $(PUGIXML_SITE)/$(PUGIXML_SOURCE) -PUGIXML_PATCH = pugixml-config.patch - pugixml: $(DL_DIR)/$(PUGIXML_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(PUGIXML_DIR) - $(UNTAR)/$(PUGIXML_SOURCE) - $(CHDIR)/$(PUGIXML_DIR); \ - $(call apply_patches,$(PUGIXML_PATCH)); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ $(CMAKE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) -rm -r $(TARGET_libdir)/cmake - $(REMOVE)/$(PUGIXML_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -931,38 +897,41 @@ LIBROXML_SITE = http://download.libroxml.net/pool/v3.x $(DL_DIR)/$(LIBROXML_SOURCE): $(DOWNLOAD) $(LIBROXML_SITE)/$(LIBROXML_SOURCE) +LIBROXML_CONF_OPTS = \ + --disable-roxml + libroxml: $(DL_DIR)/$(LIBROXML_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBROXML_DIR) - $(UNTAR)/$(LIBROXML_SOURCE) - $(CHDIR)/$(LIBROXML_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --disable-roxml \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBROXML_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -RTMPDUMP_DEPS = zlib openssl +RTMPDUMP_DEPS = zlib openssl + +RTMPDUMP_MAKE_ENV = \ + CROSS_COMPILE=$(TARGET_CROSS) \ + XCFLAGS="$(TARGET_CFLAGS)" \ + XLDFLAGS="$(TARGET_LDFLAGS)" RTMPDUMP_MAKE_OPTS = \ - prefix= \ + prefix=$(prefix) \ mandir=$(REMOVE_mandir) -rtmpdump: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR) - $(REMOVE)/$(NI-RTMPDUMP) - tar -C $(SOURCE_DIR) -cp $(NI-RTMPDUMP) --exclude-vcs | tar -C $(BUILD_DIR) -x - $(CHDIR)/$(NI-RTMPDUMP); \ - $(MAKE) $(RTMPDUMP_MAKE_OPTS) CROSS_COMPILE=$(TARGET_CROSS) XCFLAGS="$(TARGET_CFLAGS)" XLDFLAGS="$(TARGET_LDFLAGS)"; \ - $(MAKE) $(RTMPDUMP_MAKE_OPTS) install prefix=$(prefix) DESTDIR=$(TARGET_DIR) - rm -rf $(TARGET_DIR)/sbin/rtmpgw - rm -rf $(TARGET_DIR)/sbin/rtmpsrv - rm -rf $(TARGET_DIR)/sbin/rtmpsuck - $(REMOVE)/$(NI-RTMPDUMP) +rtmpdump: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI_RTMPDUMP) | $(TARGET_DIR) + $(REMOVE)/$(NI_RTMPDUMP) + tar -C $(SOURCE_DIR) -cp $(NI_RTMPDUMP) --exclude-vcs | tar -C $(BUILD_DIR) -x + $(CHDIR)/$(NI_RTMPDUMP); \ + $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS); \ + $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) + -rm $(addprefix $(TARGET_sbindir)/,rtmpgw rtmpsrv rtmpsuck) + $(REMOVE)/$(NI_RTMPDUMP) $(TOUCH) # ----------------------------------------------------------------------------- @@ -975,30 +944,25 @@ LIBTIRPC_SITE = https://sourceforge.net/projects/libtirpc/files/libtirpc/$(LIB $(DL_DIR)/$(LIBTIRPC_SOURCE): $(DOWNLOAD) $(LIBTIRPC_SITE)/$(LIBTIRPC_SOURCE) -LIBTIRP_PATCH = 0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch -LIBTIRP_PATCH += 0003-Automatically-generate-XDR-header-files-from-.x-sour.patch -LIBTIRP_PATCH += 0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch +LIBTIRPC_AUTORECONF = YES + +LIBTIRPC_CONF_OPTS = \ + --disable-gssapi \ + --enable-silent-rules libtirpc: $(DL_DIR)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBTIRPC_DIR) - $(UNTAR)/$(LIBTIRPC_SOURCE) - $(CHDIR)/$(LIBTIRPC_DIR); \ - $(call apply_patches,$(addprefix $(@F)/,$(LIBTIRP_PATCH))); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --sysconfdir=$(sysconfdir) \ - --disable-gssapi \ - --enable-silent-rules \ - --mandir=$(REMOVE_mandir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) + $(REWRITE_LIBTOOL) ifeq ($(BOXSERIES),hd1) $(SED) '/^\(udp\|tcp\)6/ d' $(TARGET_sysconfdir)/netconfig endif - $(REMOVE)/$(LIBTIRPC_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1011,21 +975,20 @@ CONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(CONF $(DL_DIR)/$(CONFUSE_SOURCE): $(DOWNLOAD) $(CONFUSE_SITE)/$(CONFUSE_SOURCE) +CONFUSE_CONF_OPTS = \ + --docdir=$(REMOVE_docdir) \ + --enable-silent-rules \ + --enable-static \ + --disable-shared + confuse: $(DL_DIR)/$(CONFUSE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(CONFUSE_DIR) - $(UNTAR)/$(CONFUSE_SOURCE) - $(CHDIR)/$(CONFUSE_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --docdir=$(REMOVE_docdir) \ - --mandir=$(REMOVE_mandir) \ - --enable-silent-rules \ - --enable-static \ - --disable-shared \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(CONFUSE_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1038,21 +1001,20 @@ LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_ $(DL_DIR)/$(LIBITE_SOURCE): $(DOWNLOAD) $(LIBITE_SITE)/$(LIBITE_SOURCE) +LIBITE_CONF_OPTS = \ + --docdir=$(REMOVE_docdir) \ + --enable-silent-rules \ + --enable-static \ + --disable-shared + libite: $(DL_DIR)/$(LIBITE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBITE_DIR) - $(UNTAR)/$(LIBITE_SOURCE) - $(CHDIR)/$(LIBITE_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --docdir=$(REMOVE_docdir) \ - --mandir=$(REMOVE_docdir) \ - --enable-silent-rules \ - --enable-static \ - --disable-shared \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(LIBITE_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1065,30 +1027,24 @@ LIBMAD_SITE = https://sourceforge.net/projects/mad/files/libmad/$(LIBMAD_VER) $(DL_DIR)/$(LIBMAD_SOURCE): $(DOWNLOAD) $(LIBMAD_SITE)/$(LIBMAD_SOURCE) -LIBMAD_PATCH = libmad-pc.patch -LIBMAD_PATCH += libmad-frame_length.diff -LIBMAD_PATCH += libmad-mips-h-constraint-removal.patch -LIBMAD_PATCH += libmad-remove-deprecated-cflags.patch -LIBMAD_PATCH += libmad-thumb2-fixed-arm.patch -LIBMAD_PATCH += libmad-thumb2-imdct-arm.patch +LIBMAD_AUTORECONF = YES + +LIBMAD_CONF_OPTS = \ + --enable-shared=yes \ + --enable-accuracy \ + --enable-fpm=arm \ + --enable-sso libmad: $(DL_DIR)/$(LIBMAD_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBMAD_DIR) - $(UNTAR)/$(LIBMAD_SOURCE) - $(CHDIR)/$(LIBMAD_DIR); \ - $(call apply_patches,$(LIBMAD_PATCH)); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-shared=yes \ - --enable-accuracy \ - --enable-fpm=arm \ - --enable-sso \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBMAD_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1101,20 +1057,25 @@ LIBVORBIS_SITE = https://downloads.xiph.org/releases/vorbis $(DL_DIR)/$(LIBVORBIS_SOURCE): $(DOWNLOAD) $(LIBVORBIS_SITE)/$(LIBVORBIS_SOURCE) -LIBVORBIS_DEPS = libogg +LIBVORBIS_DEPS = libogg + +LIBVORBIS_AUTORECONF = YES + +LIBVORBIS_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + --disable-docs \ + --disable-examples \ + --disable-oggtest libvorbis: $(LIBVORBIS_DEPS) $(DL_DIR)/$(LIBVORBIS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBVORBIS_DIR) - $(UNTAR)/$(LIBVORBIS_SOURCE) - $(CHDIR)/$(LIBVORBIS_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBVORBIS_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) @@ -1128,21 +1089,20 @@ LIBVORBISIDEC_SITE = https://ftp.de.debian.org/debian/pool/main/libv/libvorbis $(DL_DIR)/$(LIBVORBISIDEC_SOURCE): $(DOWNLOAD) $(LIBVORBISIDEC_SITE)/$(LIBVORBISIDEC_SOURCE) -LIBVORBISIDEC_DEPS = libogg +LIBVORBISIDEC_DEPS = libogg + +LIBVORBISIDEC_AUTORECONF = YES libvorbisidec: $(LIBVORBISIDEC_DEPS) $(DL_DIR)/$(LIBVORBISIDEC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBVORBISIDEC_DIR) - $(UNTAR)/$(LIBVORBISIDEC_SOURCE) - $(CHDIR)/$(LIBVORBISIDEC_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(SED) '122 s/^/#/' configure.in; \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBVORBISIDEC_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1155,19 +1115,19 @@ LIBOGG_SITE = http://downloads.xiph.org/releases/ogg $(DL_DIR)/$(LIBOGG_SOURCE): $(DOWNLOAD) $(LIBOGG_SITE)/$(LIBOGG_SOURCE) +LIBOGG_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + --enable-shared + libogg: $(DL_DIR)/$(LIBOGG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBOGG_DIR) - $(UNTAR)/$(LIBOGG_SOURCE) - $(CHDIR)/$(LIBOGG_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --enable-shared \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBOGG_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1180,20 +1140,20 @@ LIBEXIF_SITE = https://github.com/libexif/libexif/releases/download/libexif-$( $(DL_DIR)/$(LIBEXIF_SOURCE): $(DOWNLOAD) $(LIBEXIF_SITE)/$(LIBEXIF_SOURCE) +LIBEXIF_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + --with-doc-dir=$(REMOVE_docdir) + libexif: $(DL_DIR)/$(LIBEXIF_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBEXIF_DIR) - $(UNTAR)/$(LIBEXIF_SOURCE) - $(CHDIR)/$(LIBEXIF_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --with-doc-dir=$(REMOVE_docdir) \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBEXIF_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1206,20 +1166,19 @@ FRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI $(DL_DIR)/$(FRIBIDI_SOURCE): $(DOWNLOAD) $(FRIBIDI_SITE)/$(FRIBIDI_SOURCE) +FRIBIDI_CONF_OPTS = \ + --disable-debug \ + --disable-deprecated + fribidi: $(DL_DIR)/$(FRIBIDI_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FRIBIDI_DIR) - $(UNTAR)/$(FRIBIDI_SOURCE) - $(CHDIR)/$(FRIBIDI_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --disable-debug \ - --disable-deprecated \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(FRIBIDI_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1232,23 +1191,22 @@ LIBFFI_SITE = https://github.com/libffi/libffi/releases/download/v$(HOST_LIBFF $(DL_DIR)/$(LIBFFI_SOURCE): $(DOWNLOAD) $(LIBFFI_SITE)/$(LIBFFI_SOURCE) -LIBFFI_CONF = $(if $(filter $(BOXSERIES),hd1),--enable-static --disable-shared) +LIBFFI_AUTORECONF = YES + +LIBFFI_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + $(if $(filter $(BOXSERIES),hd1),--enable-static --disable-shared) libffi: $(DL_DIR)/$(LIBFFI_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBFFI_DIR) - $(UNTAR)/$(LIBFFI_SOURCE) - $(CHDIR)/$(LIBFFI_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - $(LIBFFI_CONF) \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBFFI_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1261,26 +1219,38 @@ GLIB2_SITE = https://ftp.gnome.org/pub/gnome/sources/glib/$(basename $(GLIB2_V $(DL_DIR)/$(GLIB2_SOURCE): $(DOWNLOAD) $(GLIB2_SITE)/$(GLIB2_SOURCE) -GLIB2_PATCH = glib2-disable-tests.patch -GLIB2_PATCH += glib2-automake.patch - -GLIB2_DEPS = zlib libffi +GLIB2_DEPS = zlib libffi ifeq ($(BOXSERIES),hd2) GLIB2_DEPS += gettext endif -GLIB2_CONF = $(if $(filter $(BOXSERIES),hd1),--enable-static --disable-shared) +GLIB2_AUTORECONF = YES + +GLIB2_CONF_OPTS = \ + --bindir=$(REMOVE_bindir) \ + --datadir=$(REMOVE_datadir) \ + $(if $(filter $(BOXSERIES),hd1),--enable-static --disable-shared) \ + --cache-file=arm-linux.cache \ + --disable-debug \ + --disable-selinux \ + --disable-libmount \ + --disable-fam \ + --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-compile-warnings \ + --with-threads="posix" \ + --with-pcre=internal ifeq ($(BOXTYPE),$(filter $(BOXTYPE),armbox mipsbox)) GLIB2_DEPS += libiconv - GLIB2_CONF += --with-libiconv=gnu + GLIB2_CONF_OPTS += --with-libiconv=gnu endif glib2: $(GLIB2_DEPS) $(DL_DIR)/$(GLIB2_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(GLIB2_DIR) - $(UNTAR)/$(GLIB2_SOURCE) - $(CHDIR)/$(GLIB2_DIR); \ - $(call apply_patches,$(GLIB2_PATCH)); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ echo "ac_cv_type_long_long=yes" > arm-linux.cache; \ echo "glib_cv_stack_grows=no" >> arm-linux.cache; \ echo "glib_cv_uscore=no" >> arm-linux.cache; \ @@ -1288,66 +1258,55 @@ glib2: $(GLIB2_DEPS) $(DL_DIR)/$(GLIB2_SOURCE) | $(TARGET_DIR) echo "glib_cv_va_val_copy=yes" >> arm-linux.cache; \ echo "ac_cv_func_posix_getpwuid_r=yes" >> arm-linux.cache; \ echo "ac_cv_func_posix_getgrgid_r=yes" >> arm-linux.cache; \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --cache-file=arm-linux.cache \ - --disable-debug \ - --disable-selinux \ - --disable-libmount \ - --disable-fam \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-compile-warnings \ - --with-threads="posix" \ - --with-pcre=internal \ - $(GLIB2_CONF) \ - ; \ + $(CONFIGURE); \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -f $(addprefix $(TARGET_bindir)/,gapplication gdbus* gio* glib* gobject-query gresource gsettings gtester*) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(GLIB2_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -ALSA-LIB_VER = 1.2.4 -ALSA-LIB_DIR = alsa-lib-$(ALSA-LIB_VER) -ALSA-LIB_SOURCE = alsa-lib-$(ALSA-LIB_VER).tar.bz2 -ALSA-LIB_SITE = https://www.alsa-project.org/files/pub/lib - -$(DL_DIR)/$(ALSA-LIB_SOURCE): - $(DOWNLOAD) $(ALSA-LIB_SITE)/$(ALSA-LIB_SOURCE) - -alsa-lib: $(DL_DIR)/$(ALSA-LIB_SOURCE) - $(REMOVE)/$(ALSA-LIB_DIR) - $(UNTAR)/$(ALSA-LIB_SOURCE) - $(CHDIR)/$(ALSA-LIB_DIR); \ +ALSA_LIB_VER = 1.2.4 +ALSA_LIB_DIR = alsa-lib-$(ALSA_LIB_VER) +ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VER).tar.bz2 +ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib + +$(DL_DIR)/$(ALSA_LIB_SOURCE): + $(DOWNLOAD) $(ALSA_LIB_SITE)/$(ALSA_LIB_SOURCE) + +ALSA_LIB_AUTORECONF = YES + +ALSA_LIB_CONF_OPTS = \ + --with-alsa-devdir=/dev/snd/ \ + --with-plugindir=$(libdir)/alsa \ + --without-debug \ + --with-debug=no \ + --with-versioned=no \ + --enable-symbolic-functions \ + --disable-aload \ + --disable-rawmidi \ + --disable-resmgr \ + --disable-old-symbols \ + --disable-alisp \ + --disable-ucm \ + --disable-hwdep \ + --disable-python \ + --disable-topology + +alsa-lib: $(DL_DIR)/$(ALSA_LIB_SOURCE) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --with-alsa-devdir=/dev/snd/ \ - --with-plugindir=/lib/alsa \ - --without-debug \ - --with-debug=no \ - --with-versioned=no \ - --enable-symbolic-functions \ - --disable-aload \ - --disable-rawmidi \ - --disable-resmgr \ - --disable-old-symbols \ - --disable-alisp \ - --disable-hwdep \ - --disable-python \ - --disable-topology \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(ALSA-LIB_DIR) + $(REWRITE_LIBTOOL) + find $(TARGET_datadir)/alsa/cards/ -name '*.conf' ! -name 'aliases.conf' | xargs --no-run-if-empty rm + find $(TARGET_datadir)/alsa/pcm/ -name '*.conf' ! -name 'default.conf' ! -name 'dmix.conf' ! -name 'dsnoop.conf' | xargs --no-run-if-empty rm + -rm -r $(TARGET_datadir)/aclocal + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1360,18 +1319,18 @@ POPT_SITE = ftp://anduin.linuxfromscratch.org/BLFS/popt $(DL_DIR)/$(POPT_SOURCE): $(DOWNLOAD) $(POPT_SITE)/$(POPT_SOURCE) +POPT_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) + popt: $(DL_DIR)/$(POPT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(POPT_DIR) - $(UNTAR)/$(POPT_SOURCE) - $(CHDIR)/$(POPT_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(POPT_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1384,22 +1343,25 @@ LIBICONV_SITE = $(GNU_MIRROR)/libiconv $(DL_DIR)/$(LIBICONV_SOURCE): $(DOWNLOAD) $(LIBICONV_SITE)/$(LIBICONV_SOURCE) +LIBICONV_CONF_ENV = \ + CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" + +LIBICONV_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + --enable-static \ + --disable-shared \ + --enable-relocatable + libiconv: $(DL_DIR)/$(LIBICONV_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBICONV_DIR) - $(UNTAR)/$(LIBICONV_SOURCE) - $(CHDIR)/$(LIBICONV_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(SED) '/preload/d' Makefile.in; \ - $(CONFIGURE) CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --enable-static \ - --disable-shared \ - --enable-relocatable \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBICONV_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1419,14 +1381,14 @@ endif GRAPHLCD_BASE_DEPS = freetype libiconv libusb graphlcd-base: $(GRAPHLCD_BASE_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(GRAPHLCD_BASE_DIR) - $(GET-GIT-SOURCE) $(GRAPHLCD_BASE_SITE)/$(GRAPHLCD_BASE_SOURCE) $(DL_DIR)/$(GRAPHLCD_BASE_SOURCE) - $(CPDIR)/$(GRAPHLCD_BASE_DIR) - $(CHDIR)/$(GRAPHLCD_BASE_DIR); \ - $(call apply_patches,$(addprefix $(@)/,$(GRAPHLCD_BASE_PATCH))); \ - $(MAKE_ENV) \ + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(call apply_patches,$(addprefix $(PKG_PATCHES_DIR)/,$(PKG_PATCH))); \ + $(TARGET_CONFIGURE_ENV) \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) PREFIX=$(prefix) -rm -r $(TARGET_sysconfdir)/udev - $(REMOVE)/$(GRAPHLCD_BASE_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) diff --git a/make/target-lua.mk b/make/target-lua.mk index a135a878..6a298037 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -12,22 +12,16 @@ LUA_SITE = https://www.lua.org $(DL_DIR)/$(LUA_SOURCE): $(DOWNLOAD) $(LUA_SITE)/ftp/$(LUA_SOURCE) -LUA_PATCH = lua-01-fix-LUA_ROOT.patch -LUA_PATCH += lua-01-remove-readline.patch -LUA_PATCH += lua-02-shared-libs-for-lua.patch -LUA_PATCH += lua-03-lua-pc.patch -LUA_PATCH += lua-04-crashfix.diff - LUA_DEPS = ncurses lua: $(LUA_DEPS) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LUA_DIR) $(UNTAR)/$(LUA_SOURCE) $(CHDIR)/$(LUA_DIR); \ - $(call apply_patches,$(LUA_PATCH)); \ + $(APPLY_PATCHES); \ $(MAKE) linux \ PKG_VERSION=$(LUA_VER) \ - $(MAKE_OPTS) \ + $(TARGET_MAKE_OPTS) \ AR="$(TARGET_AR) rcu" \ LDFLAGS="$(TARGET_LDFLAGS)" \ ; \ @@ -47,47 +41,47 @@ LUAEXPAT_SITE = https://github.com/tomasguisasola/luaexpat/archive $(DL_DIR)/$(LUAEXPAT_SOURCE): $(DOWNLOAD) $(LUAEXPAT_SITE)/v$(LUAEXPAT_VER).tar.gz -O $(@) -LUAEXPAT_DEPS = expat lua +LUAEXPAT_DEPS = expat lua + +LUAEXPAT_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + +LUAEXPAT_MAKE_OPTS = \ + PREFIX=$(TARGET_prefix) \ + LUA_SYS_VER=$(LUA_ABIVER) luaexpat: $(LUAEXPAT_DEPS) $(DL_DIR)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LUAEXPAT_DIR) - $(UNTAR)/$(LUAEXPAT_SOURCE) - $(CHDIR)/$(LUAEXPAT_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(SED) 's|^EXPAT_INC=.*|EXPAT_INC= $(TARGET_includedir)|' makefile; \ $(SED) 's|^CFLAGS =.*|& -L$(TARGET_libdir)|' makefile; \ $(SED) 's|^CC =.*|CC = $(TARGET_CC)|' makefile; \ - $(MAKE_ENV) \ - $(MAKE) \ - PREFIX=$(TARGET_prefix) \ - LUA_SYS_VER=$(LUA_ABIVER); \ - $(MAKE) install \ - PREFIX=$(TARGET_prefix) \ - LUA_SYS_VER=$(LUA_ABIVER) - $(REMOVE)/$(LUAEXPAT_DIR) + $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS); \ + $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) install + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -LUA-FEEDPARSER_VER = 0.71 -LUA-FEEDPARSER_DIR = lua-feedparser-$(LUA-FEEDPARSER_VER) -LUA-FEEDPARSER_SOURCE = lua-feedparser-$(LUA-FEEDPARSER_VER).tar.gz -LUA-FEEDPARSER_SITE = https://github.com/slact/lua-feedparser/archive +LUA_FEEDPARSER_VER = 0.71 +LUA_FEEDPARSER_DIR = lua-feedparser-$(LUA_FEEDPARSER_VER) +LUA_FEEDPARSER_SOURCE = lua-feedparser-$(LUA_FEEDPARSER_VER).tar.gz +LUA_FEEDPARSER_SITE = https://github.com/slact/lua-feedparser/archive -$(DL_DIR)/$(LUA-FEEDPARSER_SOURCE): - $(DOWNLOAD) $(LUA-FEEDPARSER_SITE)/$(LUA-FEEDPARSER_VER).tar.gz -O $(@) +$(DL_DIR)/$(LUA_FEEDPARSER_SOURCE): + $(DOWNLOAD) $(LUA_FEEDPARSER_SITE)/$(LUA_FEEDPARSER_VER).tar.gz -O $(@) -LUA-FEEDPARSER_PATCH = lua-feedparser.patch +LUA_FEEDPARSER_DEPS = luaexpat -LUA-DEEDPARSER_DEPS = luaexpat - -lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(DL_DIR)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LUA-FEEDPARSER_DIR) - $(UNTAR)/$(LUA-FEEDPARSER_SOURCE) - $(CHDIR)/$(LUA-FEEDPARSER_DIR); \ +lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(DL_DIR)/$(LUA_FEEDPARSER_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(SED) 's|^PREFIX =|PREFIX ?=|' Makefile; \ - $(call apply_patches,$(LUA-FEEDPARSER_PATCH)); \ + $(APPLY_PATCHES); \ $(MAKE) install PREFIX=$(TARGET_prefix) - $(REMOVE)/$(LUA-FEEDPARSER_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -100,9 +94,9 @@ $(DL_DIR)/$(LUAJSON_SOURCE): luajson: $(DL_DIR)/$(LUAJSON_SOURCE) | $(TARGET_DIR) $(CD) $(DL_DIR); \ - curl --remote-name --time-cond $(LUAJSON_SOURCE) $(LUAJSON_SITE)/$(LUAJSON_SOURCE) || true - $(INSTALL_DATA) -D $(DL_DIR)/$(LUAJSON_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER) - ln -sf $(LUAJSON_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER)/json.lua + curl --remote-name --time-cond $(PKG_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) || true + $(INSTALL_DATA) -D $(DL_DIR)/$(PKG_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER) + ln -sf $(PKG_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER)/json.lua $(TOUCH) # ----------------------------------------------------------------------------- @@ -112,24 +106,25 @@ LUACURL_DIR = lua-curlv3.$(LUACURL_VER) LUACURL_SOURCE = lua-curlv3.$(LUACURL_VER) LUACURL_SITE = https://github.com/lua-curl/$(LUACURL_SOURCE) -LUACURL_DEPS = libcurl lua +LUACURL_DEPS = libcurl lua + +LUACURL_MAKE_ENV = \ + $(TARGET_CONFIGURE_ENV) + +LUACURL_MAKE_OPTS = \ + LIBDIR=$(TARGET_libdir) \ + LUA_INC=$(TARGET_includedir) \ + LUA_CMOD=$(libdir)/lua/$(LUA_ABIVER) \ + LUA_LMOD=$(datadir)/lua/$(LUA_ABIVER) luacurl: $(LUACURL_DEPS) | $(TARGET_DIR) - echo $(TARGET_libdir) - echo $(TARGET_includedir) - echo $(TARGET_datadir) - $(REMOVE)/$(LUACURL_DIR) - $(GET-GIT-SOURCE) $(LUACURL_SITE) $(DL_DIR)/$(LUACURL_SOURCE) - $(CPDIR)/$(LUACURL_SOURCE) - $(CHDIR)/$(LUACURL_DIR); \ - $(MAKE_ENV) \ - $(MAKE) \ - LIBDIR=$(TARGET_libdir) \ - LUA_INC=$(TARGET_includedir); \ - $(MAKE) install DESTDIR=$(TARGET_DIR) \ - LUA_CMOD=$(libdir)/lua/$(LUA_ABIVER) \ - LUA_LMOD=$(datadir)/lua/$(LUA_ABIVER) - $(REMOVE)/$(LUACURL_DIR) + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS); \ + $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -142,9 +137,19 @@ LUAPOSIX_SITE = https://github.com/luaposix/luaposix/archive $(DL_DIR)/$(LUAPOSIX_SOURCE): $(DOWNLOAD) $(LUAPOSIX_SITE)/v$(LUAPOSIX_VER).tar.gz -O $(@) -LUAPOSIX_PATCH = luaposix-fix-docdir-build.patch +LUAPOSIX_DEPS = $(HOST_LUA) lua luaexpat + +LUAPOSIX_AUTORECONF = YES -LUAPOSIX_DEPS = $(HOST_LUA) lua luaexpat +LUAPOSIX_CONF_ENV = \ + LUA=$(HOST_LUA) + +LUAPOSIX_CONF_OPTS = \ + --libdir=$(TARGET_libdir)/lua/$(LUA_ABIVER) \ + --datadir=$(TARGET_datadir)/lua/$(LUA_ABIVER) \ + --mandir=$(TARGET_DIR)$(REMOVE_mandir) \ + --docdir=$(TARGET_DIR)$(REMOVE_docdir) \ + --enable-silent-rules GNULIB_VER = 20140202 GNULIB_SOURCE = gnulib-$(GNULIB_VER)-stable.tar.gz @@ -161,25 +166,15 @@ $(DL_DIR)/$(SLINGSHOT_SOURCE): $(DOWNLOAD) $(SLINGSHOT_SITE)/v$(SLINGSHOT_VER).tar.gz -O $(@) luaposix: $(LUAPOSIX_DEPS) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOURCE) $(DL_DIR)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LUAPOSIX_DIR) - $(UNTAR)/$(LUAPOSIX_SOURCE) - $(CHDIR)/$(LUAPOSIX_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ tar -C gnulib --strip=1 -xf $(DL_DIR)/$(GNULIB_SOURCE); \ tar -C slingshot --strip=1 -xf $(DL_DIR)/$(SLINGSHOT_SOURCE); \ - $(call apply_patches,$(LUAPOSIX_PATCH)); \ - export LUA=$(HOST_LUA); \ + $(APPLY_PATCHES); \ ./bootstrap; \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --exec-prefix=$(exec_prefix) \ - --libdir=$(TARGET_libdir)/lua/$(LUA_ABIVER) \ - --datarootdir=$(TARGET_datadir)/lua/$(LUA_ABIVER) \ - --mandir=$(TARGET_DIR)$(REMOVE_mandir) \ - --docdir=$(TARGET_DIR)$(REMOVE_docdir) \ - --enable-silent-rules \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install - $(REMOVE)/$(LUAPOSIX_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) diff --git a/make/target-neutrino-plugins.mk b/make/target-neutrino-plugins.mk index 27f4ea65..32783347 100644 --- a/make/target-neutrino-plugins.mk +++ b/make/target-neutrino-plugins.mk @@ -17,39 +17,40 @@ endif # ----------------------------------------------------------------------------- -NEUTRINO-PLUGINS_OBJ = $(NI-NEUTRINO-PLUGINS)-obj -NEUTRINO-PLUGINS_BUILD_DIR = $(BUILD_DIR)/$(NEUTRINO-PLUGINS_OBJ) +NEUTRINO_PLUGINS_OBJ = $(NI_NEUTRINO_PLUGINS)-obj +NEUTRINO_PLUGINS_BUILD_DIR = $(BUILD_DIR)/$(NEUTRINO_PLUGINS_OBJ) # ----------------------------------------------------------------------------- -NEUTRINO-PLUGINS_DEPS = ffmpeg -NEUTRINO-PLUGINS_DEPS += libcurl -NEUTRINO-PLUGINS_DEPS += libpng -NEUTRINO-PLUGINS_DEPS += libjpeg-turbo -NEUTRINO-PLUGINS_DEPS += giflib -NEUTRINO-PLUGINS_DEPS += freetype -NEUTRINO-PLUGINS_DEPS += luaexpat -NEUTRINO-PLUGINS_DEPS += luajson -NEUTRINO-PLUGINS_DEPS += luacurl -NEUTRINO-PLUGINS_DEPS += luaposix -NEUTRINO-PLUGINS_DEPS += lua-feedparser +NEUTRINO_PLUGINS_DEPS = ffmpeg +NEUTRINO_PLUGINS_DEPS += libcurl +NEUTRINO_PLUGINS_DEPS += libpng +NEUTRINO_PLUGINS_DEPS += libjpeg-turbo +NEUTRINO_PLUGINS_DEPS += giflib +NEUTRINO_PLUGINS_DEPS += freetype +NEUTRINO_PLUGINS_DEPS += luaexpat +NEUTRINO_PLUGINS_DEPS += luajson +NEUTRINO_PLUGINS_DEPS += luacurl +NEUTRINO_PLUGINS_DEPS += luaposix +NEUTRINO_PLUGINS_DEPS += lua-feedparser # ----------------------------------------------------------------------------- -NEUTRINO-PLUGINS_CONF_ENV = \ - $(MAKE_ENV) +NEUTRINO_PLUGINS_CONF_ENV = \ + $(TARGET_CONFIGURE_ENV) # ----------------------------------------------------------------------------- -NEUTRINO-PLUGINS_CONF_OPTS = \ - --host=$(TARGET) \ +NEUTRINO_PLUGINS_CONF_OPTS = \ --build=$(BUILD) \ + --host=$(TARGET) \ + --target=$(TARGET) \ --prefix=$(prefix) \ --sysconfdir=$(sysconfdir) \ --enable-maintainer-mode \ --enable-silent-rules \ \ - --with-neutrino-source=$(SOURCE_DIR)/$(NI-NEUTRINO) \ + --with-neutrino-source=$(SOURCE_DIR)/$(NI_NEUTRINO) \ --with-neutrino-build=$(NEUTRINO_BUILD_DIR) \ \ --with-target=cdk \ @@ -57,12 +58,12 @@ NEUTRINO-PLUGINS_CONF_OPTS = \ --with-boxtype=$(BOXTYPE) ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) - NEUTRINO-PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXSERIES) + NEUTRINO_PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXSERIES) else - NEUTRINO-PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXMODEL) + NEUTRINO_PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXMODEL) endif -NEUTRINO-PLUGINS_CONF_OPTS += \ +NEUTRINO_PLUGINS_CONF_OPTS += \ --disable-logoupdater \ --disable-logoview \ --disable-mountpointmanagement \ @@ -70,11 +71,11 @@ NEUTRINO-PLUGINS_CONF_OPTS += \ ifeq ($(BOXTYPE),coolstream) ifeq ($(BOXSERIES),hd1) - NEUTRINO-PLUGINS_CONF_OPTS += \ + NEUTRINO_PLUGINS_CONF_OPTS += \ --disable-spiegel_tv_doc \ --disable-tierwelt_tv endif - NEUTRINO-PLUGINS_CONF_OPTS += \ + NEUTRINO_PLUGINS_CONF_OPTS += \ --disable-showiframe \ --disable-stb_startup \ --disable-imgbackup \ @@ -84,37 +85,37 @@ endif # ----------------------------------------------------------------------------- ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) - NEUTRINO-PLUGINS_BOXMODEL = $(BOXSERIES) + NEUTRINO_PLUGINS_BOXMODEL = $(BOXSERIES) else - NEUTRINO-PLUGINS_BOXMODEL = $(BOXMODEL) + NEUTRINO_PLUGINS_BOXMODEL = $(BOXMODEL) endif # ----------------------------------------------------------------------------- -$(NEUTRINO-PLUGINS_BUILD_DIR)/config.status: $(NEUTRINO-PLUGINS_DEPS) - test -d $(NEUTRINO-PLUGINS_BUILD_DIR) || mkdir -p $(NEUTRINO-PLUGINS_BUILD_DIR) - $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/autogen.sh - $(CD) $(NEUTRINO-PLUGINS_BUILD_DIR); \ - $(NEUTRINO-PLUGINS_CONF_ENV) \ - $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/configure \ - $(NEUTRINO-PLUGINS_CONF_OPTS) +$(NEUTRINO_PLUGINS_BUILD_DIR)/config.status: $(NEUTRINO_PLUGINS_DEPS) + test -d $(NEUTRINO_PLUGINS_BUILD_DIR) || mkdir -p $(NEUTRINO_PLUGINS_BUILD_DIR) + $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/autogen.sh + $(CD) $(NEUTRINO_PLUGINS_BUILD_DIR); \ + $(NEUTRINO_PLUGINS_CONF_ENV) \ + $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/configure \ + $(NEUTRINO_PLUGINS_CONF_OPTS) # ----------------------------------------------------------------------------- -NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS = -NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += emmrd -NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += fritzcallmonitor -NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += openvpn -NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += rcu_switcher -#NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += stbup -NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += tuxcald -NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += tuxmaild +NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS = +NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += emmrd +NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += fritzcallmonitor +NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += openvpn +NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += rcu_switcher +#NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += stbup +NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += tuxcald +NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += tuxmaild -NEUTRINO-PLUGINS_INIT-SCRIPTS = $(NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS) -NEUTRINO-PLUGINS_INIT-SCRIPTS += turnoff_power +NEUTRINO_PLUGINS_INIT_SCRIPTS = $(NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS) +NEUTRINO_PLUGINS_INIT_SCRIPTS += turnoff_power -define NEUTRINO-PLUGINS_RUNLEVEL-LINKS_INSTALL - for script in $(NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS); do \ +define NEUTRINO_PLUGINS_RUNLEVEL_LINKS_INSTALL + for script in $(NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS); do \ if [ -x $(TARGET_sysconfdir)/init.d/$$script ]; then \ $(UPDATE-RC.D) $$script defaults 80 20; \ fi; \ @@ -124,8 +125,8 @@ define NEUTRINO-PLUGINS_RUNLEVEL-LINKS_INSTALL fi endef -define NEUTRINO-PLUGINS_RUNLEVEL-LINKS_UNINSTALL - for link in $(NEUTRINO-PLUGINS_INIT-SCRIPTS); do \ +define NEUTRINO_PLUGINS_RUNLEVEL_LINKS_UNINSTALL + for link in $(NEUTRINO_PLUGINS_INIT_SCRIPTS); do \ find $(TARGET_sysconfdir) -type l -name [SK]??$$link -print0 | \ xargs --no-run-if-empty -0 rm -f; \ done @@ -133,55 +134,55 @@ endef # ----------------------------------------------------------------------------- -neutrino-plugins: neutrino $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status - $(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR) - $(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR) install DESTDIR=$(TARGET_DIR) - $(NEUTRINO-PLUGINS_RUNLEVEL-LINKS_INSTALL) +neutrino-plugins: neutrino $(NEUTRINO_PLUGINS_BUILD_DIR)/config.status + $(MAKE) -C $(NEUTRINO_PLUGINS_BUILD_DIR) + $(MAKE) -C $(NEUTRINO_PLUGINS_BUILD_DIR) install DESTDIR=$(TARGET_DIR) + $(NEUTRINO_PLUGINS_RUNLEVEL_LINKS_INSTALL) $(TOUCH) # ----------------------------------------------------------------------------- neutrino-plugins-uninstall: - -make -C $(NEUTRINO-PLUGINS_BUILD_DIR) uninstall DESTDIR=$(TARGET_DIR) - $(NEUTRINO-PLUGINS_RUNLEVEL-LINKS_UNINSTALL) + -make -C $(NEUTRINO_PLUGINS_BUILD_DIR) uninstall DESTDIR=$(TARGET_DIR) + $(NEUTRINO_PLUGINS_RUNLEVEL_LINKS_UNINSTALL) neutrino-plugins-distclean: - -make -C $(NEUTRINO-PLUGINS_BUILD_DIR) distclean + -make -C $(NEUTRINO_PLUGINS_BUILD_DIR) distclean neutrino-plugins-clean: neutrino-plugins-uninstall neutrino-plugins-distclean - rm -f $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status + rm -f $(NEUTRINO_PLUGINS_BUILD_DIR)/config.status rm -f $(DEPS_DIR)/neutrino-plugins neutrino-plugins-clean-all: neutrino-plugins-clean - rm -rf $(NEUTRINO-PLUGINS_BUILD_DIR) + rm -rf $(NEUTRINO_PLUGINS_BUILD_DIR) # ----------------------------------------------------------------------------- # To build single plugins from neutrino-plugins repository call # make neutrino-plugin-; e.g. make neutrino-plugin-tuxwetter -neutrino-plugin-%: $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status - $(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@)) - $(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@)) install DESTDIR=$(TARGET_DIR) +neutrino-plugin-%: $(NEUTRINO_PLUGINS_BUILD_DIR)/config.status + $(MAKE) -C $(NEUTRINO_PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@)) + $(MAKE) -C $(NEUTRINO_PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@)) install DESTDIR=$(TARGET_DIR) # ----------------------------------------------------------------------------- -channellogos: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHARE_ICONS) +channellogos: $(SOURCE_DIR)/$(NI_LOGO_STUFF) $(SHARE_ICONS) rm -rf $(SHARE_LOGOS) mkdir -p $(SHARE_LOGOS) - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos/* $(SHARE_LOGOS) + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logos/* $(SHARE_LOGOS) mkdir -p $(SHARE_LOGOS)/events - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos-events/* $(SHARE_LOGOS)/events - $(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-links; \ + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logos-events/* $(SHARE_LOGOS)/events + $(CD) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-links; \ ./logo-linker.sh logo-links.db $(SHARE_LOGOS) $(TOUCH) # ----------------------------------------------------------------------------- -logo-addon: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHARE_PLUGINS) - $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.sh $(SHARE_PLUGINS)/ - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.cfg $(SHARE_PLUGINS)/ - $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.png $(SHARE_PLUGINS)/ +logo-addon: $(SOURCE_DIR)/$(NI_LOGO_STUFF) $(SHARE_PLUGINS) + $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-addon/*.sh $(SHARE_PLUGINS)/ + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-addon/*.cfg $(SHARE_PLUGINS)/ + $(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-addon/*.png $(SHARE_PLUGINS)/ $(TOUCH) # ----------------------------------------------------------------------------- @@ -193,22 +194,22 @@ doscam-webif-skin: # ----------------------------------------------------------------------------- -NEUTRINO-MEDIATHEK_VER = git -NEUTRINO-MEDIATHEK_DIR = mediathek.$(NEUTRINO-MEDIATHEK_VER) -NEUTRINO-MEDIATHEK_SOURCE = mediathek.$(NEUTRINO-MEDIATHEK_VER) -NEUTRINO-MEDIATHEK_SITE = https://github.com/neutrino-mediathek +NEUTRINO_MEDIATHEK_VER = git +NEUTRINO_MEDIATHEK_DIR = mediathek.$(NEUTRINO_MEDIATHEK_VER) +NEUTRINO_MEDIATHEK_SOURCE = mediathek.$(NEUTRINO_MEDIATHEK_VER) +NEUTRINO_MEDIATHEK_SITE = https://github.com/neutrino-mediathek neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR) - $(REMOVE)/$(NEUTRINO-MEDIATHEK_DIR) - $(GET-GIT-SOURCE) $(NEUTRINO-MEDIATHEK_SITE)/$(NEUTRINO-MEDIATHEK_SOURCE) $(DL_DIR)/$(NEUTRINO-MEDIATHEK_SOURCE) - $(CPDIR)/$(NEUTRINO-MEDIATHEK_SOURCE) - $(CHDIR)/$(NEUTRINO-MEDIATHEK_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(INSTALL_COPY) plugins/* $(SHARE_PLUGINS)/; \ $(INSTALL_COPY) share/* $(TARGET_datadir) - $(REMOVE)/$(NEUTRINO-MEDIATHEK_DIR) + $(REMOVE)/$(PKG_DIR) # temporarily use beta-version from our board rm -rf $(SHARE_PLUGINS)/neutrino-mediathek* - $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/plugins/mediathek/* $(SHARE_PLUGINS)/ + $(INSTALL_COPY) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/plugins/mediathek/* $(SHARE_PLUGINS)/ $(TOUCH) # ----------------------------------------------------------------------------- @@ -221,7 +222,7 @@ LINKS_SITE = http://links.twibright.com/download $(DL_DIR)/$(LINKS_SOURCE): $(DOWNLOAD) $(LINKS_SITE)/$(LINKS_SOURCE) -LINKS_DEPS = libpng libjpeg-turbo openssl +LINKS_DEPS = libpng libjpeg-turbo openssl LINKS_PATCH = links.patch LINKS_PATCH += links-ac-prog-cxx.patch @@ -235,6 +236,21 @@ else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),h7)) LINKS_PATCH += links-input-event2.patch endif +LINKS_AUTORECONF = YES + +LINKS_CONF_OPTS = \ + --enable-graphics \ + --with-fb \ + --with-libjpeg \ + --with-ssl=$(TARGET_DIR) \ + --without-atheos \ + --without-directfb \ + --without-libtiff \ + --without-lzma \ + --without-pmshell \ + --without-svgalib \ + --without-x + links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR) $(REMOVE)/$(LINKS_DIR) $(UNTAR)/$(LINKS_SOURCE) @@ -245,22 +261,7 @@ links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR) ./gen-intl $(CHDIR)/$(LINKS_DIR); \ $(call apply_patches,$(LINKS_PATCH)); \ - autoreconf -vfi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --enable-graphics \ - --with-fb \ - --with-libjpeg \ - --with-ssl=$(TARGET_DIR) \ - --without-atheos \ - --without-directfb \ - --without-libtiff \ - --without-lzma \ - --without-pmshell \ - --without-svgalib \ - --without-x \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mv -f $(TARGET_bindir)/links $(SHARE_PLUGINS)/links.so diff --git a/make/target-neutrino.mk b/make/target-neutrino.mk index 2fe3fae6..a4ceaec1 100644 --- a/make/target-neutrino.mk +++ b/make/target-neutrino.mk @@ -5,7 +5,7 @@ NEUTRINO_INST_DIR ?= $(TARGET_DIR) -NEUTRINO_OBJ = $(NI-NEUTRINO)-obj +NEUTRINO_OBJ = $(NI_NEUTRINO)-obj NEUTRINO_BUILD_DIR = $(BUILD_DIR)/$(NEUTRINO_OBJ) ifeq ($(BOXTYPE),coolstream) @@ -14,8 +14,8 @@ else NEUTRINO_BRANCH ?= master endif -LIBSTB-HAL_OBJ = $(NI-LIBSTB-HAL)-obj -LIBSTB-HAL_BUILD_DIR = $(BUILD_DIR)/$(LIBSTB-HAL_OBJ) +LIBSTB_HAL_OBJ = $(NI_LIBSTB_HAL)-obj +LIBSTB_HAL_BUILD_DIR = $(BUILD_DIR)/$(LIBSTB_HAL_OBJ) # ----------------------------------------------------------------------------- @@ -55,7 +55,7 @@ NEUTRINO_CFLAGS += -Wno-psabi # ----------------------------------------------------------------------------- -NEUTRINO_LDFLAGS = $(CORTEX-STRINGS_LDFLAG) +NEUTRINO_LDFLAGS = $(CORTEX_STRINGS_LDFLAG) NEUTRINO_LDFLAGS += -L$(TARGET_base_libdir) -L$(TARGET_libdir) NEUTRINO_LDFLAGS += -Wl,-rpath,$(TARGET_libdir) -Wl,-rpath-link,$(TARGET_libdir) ifeq ($(DEBUG),yes) @@ -76,7 +76,7 @@ NEUTRINO_WEATHER_DEV_KEY ?= # ----------------------------------------------------------------------------- NEUTRINO_CONF_ENV = \ - $(MAKE_OPTS) \ + $(TARGET_MAKE_OPTS) \ \ CFLAGS="$(NEUTRINO_CFLAGS)" \ CPPFLAGS="$(NEUTRINO_CFLAGS)" \ @@ -91,8 +91,9 @@ NEUTRINO_CONF_ENV += \ # ----------------------------------------------------------------------------- NEUTRINO_CONF_OPTS = \ - --host=$(TARGET) \ --build=$(BUILD) \ + --host=$(TARGET) \ + --target=$(TARGET) \ --prefix=$(prefix) \ --enable-maintainer-mode \ --enable-silent-rules \ @@ -137,8 +138,8 @@ ifeq ($(BOXTYPE),coolstream) else NEUTRINO_DEPS += libstb-hal NEUTRINO_CONF_OPTS += \ - --with-stb-hal-includes=$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/include \ - --with-stb-hal-build=$(LIBSTB-HAL_BUILD_DIR) + --with-stb-hal-includes=$(SOURCE_DIR)/$(NI_LIBSTB_HAL)/include \ + --with-stb-hal-build=$(LIBSTB_HAL_BUILD_DIR) NEUTRINO_DEPS += graphlcd-base NEUTRINO_CONF_OPTS += --enable-graphlcd @@ -174,12 +175,12 @@ endif $(NEUTRINO_BUILD_DIR)/config.status: $(NEUTRINO_DEPS) test -d $(NEUTRINO_BUILD_DIR) || mkdir -p $(NEUTRINO_BUILD_DIR) - $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \ + $(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \ git checkout $(NEUTRINO_BRANCH) - $(SOURCE_DIR)/$(NI-NEUTRINO)/autogen.sh + $(SOURCE_DIR)/$(NI_NEUTRINO)/autogen.sh $(CD) $(NEUTRINO_BUILD_DIR); \ $(NEUTRINO_CONF_ENV) \ - $(SOURCE_DIR)/$(NI-NEUTRINO)/configure \ + $(SOURCE_DIR)/$(NI_NEUTRINO)/configure \ $(NEUTRINO_CONF_OPTS) # ----------------------------------------------------------------------------- @@ -197,20 +198,21 @@ $(TARGET_sysconfdir)/init.d/start_neutrino: # ----------------------------------------------------------------------------- -LIBSTB-HAL_DEPS = -LIBSTB-HAL_DEPS += ffmpeg -LIBSTB-HAL_DEPS += openthreads +LIBSTB_HAL_DEPS = +LIBSTB_HAL_DEPS += ffmpeg +LIBSTB_HAL_DEPS += openthreads # ----------------------------------------------------------------------------- -LIBSTB-HAL_CONF_ENV = \ +LIBSTB_HAL_CONF_ENV = \ $(NEUTRINO_CONF_ENV) # ----------------------------------------------------------------------------- -LIBSTB-HAL_CONF_OPTS = \ - --host=$(TARGET) \ +LIBSTB_HAL_CONF_OPTS = \ --build=$(BUILD) \ + --host=$(TARGET) \ + --target=$(TARGET) \ --prefix=$(prefix) \ --enable-maintainer-mode \ --enable-silent-rules \ @@ -221,27 +223,27 @@ LIBSTB-HAL_CONF_OPTS = \ --with-boxtype=$(BOXTYPE) ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) - LIBSTB-HAL_CONF_OPTS += --with-boxmodel=$(BOXSERIES) + LIBSTB_HAL_CONF_OPTS += --with-boxmodel=$(BOXSERIES) else - LIBSTB-HAL_CONF_OPTS += --with-boxmodel=$(BOXMODEL) + LIBSTB_HAL_CONF_OPTS += --with-boxmodel=$(BOXMODEL) endif # ----------------------------------------------------------------------------- -$(LIBSTB-HAL_BUILD_DIR)/config.status: $(LIBSTB-HAL_DEPS) - test -d $(LIBSTB-HAL_BUILD_DIR) || mkdir -p $(LIBSTB-HAL_BUILD_DIR) - $(SOURCE_DIR)/$(NI-LIBSTB-HAL)/autogen.sh - $(CD) $(LIBSTB-HAL_BUILD_DIR); \ - $(LIBSTB-HAL_CONF_ENV) \ - $(SOURCE_DIR)/$(NI-LIBSTB-HAL)/configure \ - $(LIBSTB-HAL_CONF_OPTS) +$(LIBSTB_HAL_BUILD_DIR)/config.status: $(LIBSTB_HAL_DEPS) + test -d $(LIBSTB_HAL_BUILD_DIR) || mkdir -p $(LIBSTB_HAL_BUILD_DIR) + $(SOURCE_DIR)/$(NI_LIBSTB_HAL)/autogen.sh + $(CD) $(LIBSTB_HAL_BUILD_DIR); \ + $(LIBSTB_HAL_CONF_ENV) \ + $(SOURCE_DIR)/$(NI_LIBSTB_HAL)/configure \ + $(LIBSTB_HAL_CONF_OPTS) # ----------------------------------------------------------------------------- -libstb-hal: $(LIBSTB-HAL_BUILD_DIR)/config.status - $(MAKE) -C $(LIBSTB-HAL_BUILD_DIR) - $(MAKE) -C $(LIBSTB-HAL_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR) - $(REWRITE_LIBTOOL_LA) +libstb-hal: $(LIBSTB_HAL_BUILD_DIR)/config.status + $(MAKE) -C $(LIBSTB_HAL_BUILD_DIR) + $(MAKE) -C $(LIBSTB_HAL_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR) + $(REWRITE_LIBTOOL) $(TOUCH) # ----------------------------------------------------------------------------- @@ -277,17 +279,17 @@ neutrino-clean-all: neutrino-clean # ----------------------------------------------------------------------------- libstb-hal-uninstall: - -make -C $(LIBSTB-HAL_BUILD_DIR) uninstall DESTDIR=$(TARGET_DIR) + -make -C $(LIBSTB_HAL_BUILD_DIR) uninstall DESTDIR=$(TARGET_DIR) libstb-hal-distclean: - -make -C $(LIBSTB-HAL_BUILD_DIR) distclean + -make -C $(LIBSTB_HAL_BUILD_DIR) distclean libstb-hal-clean: libstb-hal-uninstall libstb-hal-distclean - rm -f $(LIBSTB-HAL_BUILD_DIR)/config.status + rm -f $(LIBSTB_HAL_BUILD_DIR)/config.status rm -f $(DEPS_DIR)/libstb-hal libstb-hal-clean-all: libstb-hal-clean - rm -rf $(LIBSTB-HAL_BUILD_DIR) + rm -rf $(LIBSTB_HAL_BUILD_DIR) # ----------------------------------------------------------------------------- diff --git a/make/target-rootfs.mk b/make/target-rootfs.mk index f063d409..23de404e 100644 --- a/make/target-rootfs.mk +++ b/make/target-rootfs.mk @@ -20,7 +20,7 @@ $(TARGET_DIR)/.version: | $(TARGET_DIR) echo "describe=$$(git describe --always --long --tags | sed 's/-/./2')" >> $(@) echo "builddate=$$(date)" >> $(@) echo "box_model=$(BOXMODEL)" >> $(@) - echo "creator=$(MAINTAINER)" >> $(@) + echo "creator=$(TARGET_VENDOR), $(MAINTAINER)" >> $(@) echo "homepage=www.neutrino-images.de" >> $(@) ifeq ($(BOXTYPE),$(filter $(BOXTYPE),armbox mipsbox)) echo "imagedir=$(IMAGE_SUBDIR)" >> $(@) @@ -30,7 +30,7 @@ endif update.urls: $(TARGET_localstatedir)/etc/update.urls $(TARGET_localstatedir)/etc/update.urls: | $(TARGET_DIR) - echo "$(NI-SERVER)/update.php" > $(@) + echo "$(NI_SERVER)/update.php" > $(@) echo "$(CHANNELLISTS_SITE)/$(CHANNELLISTS_MD5FILE)" >> $(@) # ----------------------------------------------------------------------------- @@ -122,14 +122,14 @@ rootfs-cleanup: $(ROOTFS) # ----------------------------------------------------------------------------- -ROOTFS-STRIP_BINS = $(base_bindir) -ROOTFS-STRIP_BINS += $(base_sbindir) -ROOTFS-STRIP_BINS += $(bindir) -ROOTFS-STRIP_BINS += $(sbindir) -ROOTFS-STRIP_BINS += /usr/share/tuxbox/neutrino/plugins +ROOTFS_STRIP_BINS = $(base_bindir) +ROOTFS_STRIP_BINS += $(base_sbindir) +ROOTFS_STRIP_BINS += $(bindir) +ROOTFS_STRIP_BINS += $(sbindir) +ROOTFS_STRIP_BINS += /usr/share/tuxbox/neutrino/plugins -ROOTFS-STRIP_LIBS = $(base_libdir) -ROOTFS-STRIP_LIBS += $(libdir) +ROOTFS_STRIP_LIBS = $(base_libdir) +ROOTFS_STRIP_LIBS += $(libdir) # strip bins and libs in root filesystem rootfs-strip: $(ROOTFS) @@ -137,10 +137,10 @@ ifneq ($(DEBUG),yes) $(call draw_line); @echo "The following warnings from strip are harmless!" $(call draw_line); - for dir in $(ROOTFS-STRIP_BINS); do \ + for dir in $(ROOTFS_STRIP_BINS); do \ find $(ROOTFS)$${dir} -type f -print0 | xargs -0 $(TARGET_STRIP) || true; \ done - for dir in $(ROOTFS-STRIP_LIBS); do \ + for dir in $(ROOTFS_STRIP_LIBS); do \ find $(ROOTFS)$${dir} \( \ -path $(ROOTFS)/lib/libnexus.so -o \ -path $(ROOTFS)/lib/libnxpl.so -o \ @@ -168,7 +168,7 @@ get-update-info-hd2: $(call draw_line); @echo "Get update info for boxmodel $(BOXMODEL)" @echo - @$(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR); \ + @$(CD) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR); \ if [ -e vmlinux.ub.gz ]; then \ dd status=none if=vmlinux.ub.gz bs=1 skip=$$(LC_ALL=C grep -a -b -o $$'\x1f\x8b\x08\x00\x00\x00\x00\x00' vmlinux.ub.gz \ | cut -d ':' -f 1) | zcat -q | grep -a "Linux version"; \ @@ -185,7 +185,7 @@ get-update-info-hd1: $(call draw_line); @echo "Get update info for boxmodel $(BOXMODEL)" @echo - @$(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR); \ + @$(CD) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR); \ if [ -e zImage ]; then \ dd if=zImage bs=1 skip=$$(LC_ALL=C grep -a -b -o $$'\x1f\x8b\x08\x00\x00\x00\x00\x00' zImage \ | cut -d ':' -f 1) | zcat -q | grep -a "Linux version"; \ diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index 00787f16..c5a3666c 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -12,29 +12,22 @@ USBUTILS_SITE = $(KERNEL_MIRROR)/linux/utils/usb/usbutils $(DL_DIR)/$(USBUTILS_SOURCE): $(DOWNLOAD) $(USBUTILS_SITE)/$(USBUTILS_SOURCE) -USBUTILS_PATCH = usbutils-avoid-dependency-on-bash.patch -USBUTILS_PATCH += usbutils-fix-null-pointer-crash.patch - -USBUTILS_DEPS = libusb-compat +USBUTILS_DEPS = libusb-compat usbutils: $(USBUTILS_DEPS) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(USBUTILS_DIR) - $(UNTAR)/$(USBUTILS_SOURCE) - $(CHDIR)/$(USBUTILS_DIR); \ - $(call apply_patches,$(USBUTILS_PATCH)); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --infodir=$(REMOVE_infodir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_bindir)/lsusb.py rm -rf $(TARGET_bindir)/usbhid-dump - rm -rf $(TARGET_DIR)/sbin/update-usbids.sh + rm -rf $(TARGET_sbindir)/update-usbids.sh rm -rf $(TARGET_datadir)/pkgconfig rm -rf $(TARGET_datadir)/usb.ids.gz - $(REMOVE)/$(USBUTILS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -47,51 +40,49 @@ BINUTILS_SITE = $(GNU_MIRROR)/binutils $(DL_DIR)/$(BINUTILS_SOURCE): $(DOWNLOAD) $(BINUTILS_SITE)/$(BINUTILS_SOURCE) -BINUTILS_BIN = objdump objcopy +BINUTILS_CONF_OPTS = \ + --disable-multilib \ + --disable-werror \ + --disable-plugins \ + --enable-build-warnings=no \ + --disable-sim \ + --disable-gdb + +BINUTILS_BINARIES = objdump objcopy binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BINUTILS_DIR) - $(UNTAR)/$(BINUTILS_SOURCE) - $(CHDIR)/$(BINUTILS_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --disable-multilib \ - --disable-werror \ - --disable-plugins \ - --enable-build-warnings=no \ - --disable-sim \ - --disable-gdb \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ - for bin in $(BINUTILS_BIN); do \ - $(INSTALL_EXEC) $(BUILD_DIR)/$(BINUTILS_DIR)/binutils/$$bin $(TARGET_bindir)/; \ + for bin in $($(PKG)_BINARIES); do \ + $(INSTALL_EXEC) $(BUILD_DIR)/$(PKG_DIR)/binutils/$$bin $(TARGET_bindir)/; \ done - $(REMOVE)/$(BINUTILS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -BASE-PASSWD_VER = 3.5.29 -BASE-PASSWD_DIR = base-passwd-$(BASE-PASSWD_VER) -BASE-PASSWD_SOURCE = base-passwd_$(BASE-PASSWD_VER).tar.gz -BASE-PASSWD_SITE = https://launchpad.net/debian/+archive/primary/+files +BASE_PASSWD_VER = 3.5.29 +BASE_PASSWD_DIR = base-passwd-$(BASE_PASSWD_VER) +BASE_PASSWD_SOURCE = base-passwd_$(BASE_PASSWD_VER).tar.gz +BASE_PASSWD_SITE = https://launchpad.net/debian/+archive/primary/+files -$(DL_DIR)/$(BASE-PASSWD_SOURCE): - $(DOWNLOAD) $(BASE-PASSWD_SITE)/$(BASE-PASSWD_SOURCE) +$(DL_DIR)/$(BASE_PASSWD_SOURCE): + $(DOWNLOAD) $(BASE_PASSWD_SITE)/$(BASE_PASSWD_SOURCE) -base-passwd: $(DL_DIR)/$(BASE-PASSWD_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BASE-PASSWD_DIR) - $(UNTAR)/$(BASE-PASSWD_SOURCE) - $(CHDIR)/$(BASE-PASSWD_DIR); \ +base-passwd: $(DL_DIR)/$(BASE_PASSWD_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(INSTALL_DATA) -D $(PKG_BUILD_DIR)/group.master $(TARGET_datadir)/base-passwd/group.master $(INSTALL_DATA) -D $(PKG_BUILD_DIR)/passwd.master $(TARGET_datadir)/base-passwd/passwd.master - $(REMOVE)/$(BASE-PASSWD_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -104,44 +95,69 @@ SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADO $(DL_DIR)/$(SHADOW_SOURCE): $(DOWNLOAD) $(SHADOW_SITE)/$(SHADOW_SOURCE) +SHADOW_CONF_OPTS = \ + --prefix=$(base_prefix) \ + --datarootdir=$(REMOVE_base_datarootdir) + shadow: $(DL_DIR)/$(SHADOW_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SHADOW_DIR) - $(UNTAR)/$(SHADOW_SOURCE) - $(CHDIR)/$(SHADOW_DIR); \ - $(CONFIGURE) \ - --prefix=$(base_prefix) \ - --datarootdir=$(REMOVE_base_datarootdir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(SED) 's|SHELL=.*|SHELL=/bin/sh|' $(TARGET_sysconfdir)/default/useradd mkdir -p $(TARGET_sysconfdir)/skel - $(REMOVE)/$(SHADOW_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -ASTRA-SM_VER = git -ASTRA-SM_DIR = astra-sm.$(ASTRA-SM_VER) -ASTRA-SM_SOURCE = astra-sm.$(ASTRA-SM_VER) -ASTRA-SM_SITE = https://gitlab.com/crazycat69 +BZIP2_VER = 1.0.8 +BZIP2_DIR = bzip2-$(BZIP2_VER) +BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz +BZIP2_SITE = https://sourceware.org/pub/bzip2 + +$(DL_DIR)/$(BZIP2_SOURCE): + $(DOWNLOAD) $(BZIP2_SITE)/$(BZIP2_SOURCE) -ASTRA-SM_DEPS = openssl +bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + mv Makefile-libbz2_so Makefile; \ + $(TARGET_CONFIGURE_ENV) \ + $(MAKE); \ + $(MAKE) install PREFIX=$(TARGET_prefix) + rm -f $(TARGET_bindir)/bzip2 + $(REMOVE)/$(PKG_DIR) + $(TOUCH) + +# ----------------------------------------------------------------------------- -astra-sm: $(ASTRA-SM_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(ASTRA-SM_DIR) - $(GET-GIT-SOURCE) $(ASTRA-SM_SITE)/$(ASTRA-SM_SOURCE) $(DL_DIR)/$(ASTRA-SM_SOURCE) - $(CPDIR)/$(ASTRA-SM_SOURCE) - $(CHDIR)/$(ASTRA-SM_DIR); \ - autoreconf -fi; \ +ASTRA_SM_VER = git +ASTRA_SM_DIR = astra-sm.$(ASTRA_SM_VER) +ASTRA_SM_SOURCE = astra-sm.$(ASTRA_SM_VER) +ASTRA_SM_SITE = https://gitlab.com/crazycat69 + +ASTRA_SM_DEPS = openssl + +ASTRA_SM_AUTORECONF = YES + +ASTRA_SM_CONF_OPTS = \ + --without-lua + +astra-sm: $(ASTRA_SM_DEPS) | $(TARGET_DIR) + $(REMOVE)/$(ASTRA_SM_DIR) + $(GET-GIT-SOURCE) $(ASTRA_SM_SITE)/$(ASTRA_SM_SOURCE) $(DL_DIR)/$(ASTRA_SM_SOURCE) + $(CPDIR)/$(ASTRA_SM_SOURCE) + $(CHDIR)/$(ASTRA_SM_DIR); \ sed -i 's:(CFLAGS):(CFLAGS_FOR_BUILD):' tools/Makefile.am; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --sysconfdir=$(sysconfdir) \ - --without-lua \ - ; \ + $(CONFIGURE); \ + $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(ASTRA-SM_DIR) + $(REMOVE)/$(ASTRA_SM_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -155,15 +171,15 @@ $(DL_DIR)/$(IOZONE_SOURCE): $(DOWNLOAD) $(IOZONE_SITE)/$(IOZONE_SOURCE) iozone: $(DL_DIR)/$(IOZONE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(IOZONE_DIR) - $(UNTAR)/$(IOZONE_SOURCE) - $(CHDIR)/$(IOZONE_DIR)/src/current; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR)/src/current; \ $(SED) "s/= gcc/= $(TARGET_CC)/" makefile; \ $(SED) "s/= cc/= $(TARGET_CC)/" makefile; \ - $(MAKE_ENV) \ + $(TARGET_CONFIGURE_ENV) \ $(MAKE) linux-arm; \ - $(INSTALL_EXEC) iozone $(TARGET_bindir)/ - $(REMOVE)/$(IOZONE_DIR) + $(INSTALL_EXEC) -D iozone $(TARGET_bindir)/iozone + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -176,92 +192,89 @@ READLINE_SITE = $(GNU_MIRROR)/readline $(DL_DIR)/$(READLINE_SOURCE): $(DOWNLOAD) $(READLINE_SITE)/$(READLINE_SOURCE) +READLINE_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) + readline: $(DL_DIR)/$(READLINE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(READLINE_DIR) - $(UNTAR)/$(READLINE_SOURCE) - $(CHDIR)/$(READLINE_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(READLINE_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBZEN_VER = 0.4.38 -LIBZEN_TMP = ZenLib +LIBZEN_DIR = ZenLib LIBZEN_SOURCE = libzen_$(LIBZEN_VER).tar.bz2 LIBZEN_SITE = https://mediaarea.net/download/source/libzen/$(LIBZEN_VER) $(DL_DIR)/$(LIBZEN_SOURCE): $(DOWNLOAD) $(LIBZEN_SITE)/$(LIBZEN_SOURCE) -LIBZEN_DEPS = zlib +LIBZEN_DEPS = zlib + +LIBZEN_AUTORECONF = YES libzen: $(LIBZEN_DEPS) $(DL_DIR)/$(LIBZEN_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBZEN_TMP) - $(UNTAR)/$(LIBZEN_SOURCE) - $(CHDIR)/$(LIBZEN_TMP)/Project/GNU/Library; \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR)/Project/GNU/Library; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBZEN_TMP) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBMEDIAINFO_VER = 20.08 -LIBMEDIAINFO_TMP = MediaInfoLib +LIBMEDIAINFO_DIR = MediaInfoLib LIBMEDIAINFO_SOURCE = libmediainfo_$(LIBMEDIAINFO_VER).tar.bz2 LIBMEDIAINFO_SITE = https://mediaarea.net/download/source/libmediainfo/$(LIBMEDIAINFO_VER) $(DL_DIR)/$(LIBMEDIAINFO_SOURCE): $(DOWNLOAD) $(LIBMEDIAINFO_SITE)/$(LIBMEDIAINFO_SOURCE) -LIBMEDIAINFO_DEPS = libzen +LIBMEDIAINFO_DEPS = libzen + +LIBMEDIAINFO_AUTORECONF = YES libmediainfo: $(LIBMEDIAINFO_DEPS) $(DL_DIR)/$(LIBMEDIAINFO_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBMEDIAINFO_TMP) - $(UNTAR)/$(LIBMEDIAINFO_SOURCE) - $(CHDIR)/$(LIBMEDIAINFO_TMP)/Project/GNU/Library; \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR)/Project/GNU/Library; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBMEDIAINFO_TMP) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- MEDIAINFO_VER = 20.08 -MEDIAINFO_TMP = MediaInfo +MEDIAINFO_DIR = MediaInfo MEDIAINFO_SOURCE = mediainfo_$(MEDIAINFO_VER).tar.bz2 MEDIAINFO_SITE = https://mediaarea.net/download/source/mediainfo/$(MEDIAINFO_VER) $(DL_DIR)/$(MEDIAINFO_SOURCE): $(DOWNLOAD) $(MEDIAINFO_SITE)/$(MEDIAINFO_SOURCE) -MEDIAINFO_DEPS = libmediainfo +MEDIAINFO_DEPS = libmediainfo + +MEDIAINFO_AUTORECONF = YES mediainfo: $(MEDIAINFO_DEPS) $(DL_DIR)/$(MEDIAINFO_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(MEDIAINFO_TMP) + $(REMOVE)/$(MEDIAINFO_DIR) $(UNTAR)/$(MEDIAINFO_SOURCE) - $(CHDIR)/$(MEDIAINFO_TMP)/Project/GNU/CLI; \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - ; \ + $(CHDIR)/$(MEDIAINFO_DIR)/Project/GNU/CLI; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(MEDIAINFO_TMP) + $(REMOVE)/$(MEDIAINFO_DIR) $(TOUCH) diff --git a/make/target-tools.mk b/make/target-tools.mk index 6d271ade..2360cb83 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -16,12 +16,7 @@ BUSYBOX_SITE = https://busybox.net/downloads $(DL_DIR)/$(BUSYBOX_SOURCE): $(DOWNLOAD) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE) -BUSYBOX_PATCH = busybox-fix-config-header.diff -BUSYBOX_PATCH += busybox-insmod-hack.patch -BUSYBOX_PATCH += busybox-fix-partition-size.patch -BUSYBOX_PATCH += busybox-mount_single_uuid.patch - -BUSYBOX_DEPS = libtirpc +BUSYBOX_DEPS = libtirpc # Link busybox against libtirpc so that we can leverage its RPC support for NFS # mounting with BusyBox @@ -38,7 +33,7 @@ BUSYBOX_MAKE_ENV = \ CFLAGS_busybox="$(BUSYBOX_CFLAGS_busybox)" BUSYBOX_MAKE_OPTS = \ - $(MAKE_OPTS) \ + $(TARGET_MAKE_OPTS) \ CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ CONFIG_PREFIX="$(TARGET_DIR)" @@ -46,7 +41,7 @@ BUSYBOX_MAKE_OPTS = \ BUSYBOX_BUILD_CONFIG = $(BUILD_DIR)/$(BUSYBOX_DIR)/.config define BUSYBOX_INSTALL_CONFIG - $(INSTALL_DATA) $(CONFIGS)/busybox-minimal.config $(BUSYBOX_BUILD_CONFIG) + $(INSTALL_DATA) $(PKG_FILES_DIR)/busybox-minimal.config $(BUSYBOX_BUILD_CONFIG) $(call KCONFIG_SET_OPT,CONFIG_PREFIX,"$(TARGET_DIR)",$(BUSYBOX_BUILD_CONFIG)) endef @@ -115,17 +110,17 @@ define BUSYBOX_ADD_TO_SHELLS endef busybox: $(BUSYBOX_DEPS) $(DL_DIR)/$(BUSYBOX_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BUSYBOX_DIR) - $(UNTAR)/$(BUSYBOX_SOURCE) - $(CHDIR)/$(BUSYBOX_DIR); \ - $(call apply_patches,$(BUSYBOX_PATCH)) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ $(BUSYBOX_INSTALL_CONFIG) $(BUSYBOX_MODIFY_CONFIG) - $(CHDIR)/$(BUSYBOX_DIR); \ - $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) busybox; \ - $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) install-noclobber + $(CHDIR)/$(PKG_DIR); \ + $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) busybox; \ + $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) install-noclobber $(BUSYBOX_ADD_TO_SHELLS) - $(REMOVE)/$(BUSYBOX_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -138,7 +133,17 @@ BASH_SITE = $(GNU_MIRROR)/bash $(DL_DIR)/$(BASH_SOURCE): $(DOWNLOAD) $(BASH_SITE)/$(BASH_SOURCE) -BASH_PATCH = $(PATCHES)/bash +BASH_CONF_ENV += \ + bash_cv_getcwd_malloc=yes \ + bash_cv_job_control_missing=present \ + bash_cv_sys_named_pipes=present \ + bash_cv_func_sigsetjmp=present \ + bash_cv_printf_a_format=yes + +BASH_CONF_OPTS = \ + --bindir=$(base_bindir) \ + --datarootdir=$(REMOVE_datarootdir) \ + --without-bash-malloc define BASH_ADD_TO_SHELLS grep -qsE '^/bin/bash$$' $(TARGET_sysconfdir)/shells \ @@ -146,21 +151,17 @@ define BASH_ADD_TO_SHELLS endef bash: $(DL_DIR)/$(BASH_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BASH_DIR) - $(UNTAR)/$(BASH_SOURCE) - $(CHDIR)/$(BASH_DIR); \ - $(call apply_patches,$(BASH_PATCH),0); \ - $(CONFIGURE) \ - --prefix=$(base_prefix) \ - --includedir=$(includedir) \ - --libdir=$(libdir) \ - --datarootdir=$(REMOVE_datarootdir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(call apply_patches,$(PKG_PATCHES_DIR),0); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) -rm $(addprefix $(TARGET_libdir)/bash/, loadables.h Makefile.inc) + -rm -f $(addprefix $(TARGET_base_bindir)/, bashbug) $(BASH_ADD_TO_SHELLS) - $(REMOVE)/$(BASH_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -174,16 +175,16 @@ $(DL_DIR)/$(SYSVINIT_SOURCE): $(DOWNLOAD) $(SYSVINIT_SITE)/$(SYSVINIT_SOURCE) sysvinit: $(DL_DIR)/$(SYSVINIT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SYSVINIT_DIR) - $(UNTAR)/$(SYSVINIT_SOURCE) - $(CHDIR)/$(SYSVINIT_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - $(MAKE_ENV) \ + $(TARGET_CONFIGURE_ENV) \ $(MAKE) -C src SULOGINLIBS=-lcrypt; \ $(MAKE) install ROOT=$(TARGET_DIR) MANDIR=$(REMOVE_mandir) -rm $(addprefix $(TARGET_base_sbindir)/,bootlogd fstab-decode logsave telinit) -rm $(addprefix $(TARGET_bindir)/,last lastb mesg readbootlog utmpdump wall) - $(REMOVE)/$(SYSVINIT_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -196,120 +197,138 @@ COREUTILS_SITE = $(GNU_MIRROR)/coreutils $(DL_DIR)/$(COREUTILS_SOURCE): $(DOWNLOAD) $(COREUTILS_SITE)/$(COREUTILS_SOURCE) -COREUTILS_PATCH = coreutils-fix-build.patch +COREUTILS_AUTORECONF = YES -COREUTILS_BIN = touch +COREUTILS_CONF_OPTS = \ + --prefix=$(base_prefix) \ + --exec_prefix=$(base_prefix) \ + --includedir=$(includedir) \ + --libdir=$(libdir) \ + --bindir=$(base_bindir).$(@F) \ + --libexecdir=$(REMOVE_libexecdir) \ + --datarootdir=$(REMOVE_datarootdir) \ + --enable-silent-rules \ + --disable-xattr \ + --disable-libcap \ + --disable-acl \ + --without-gmp \ + --without-selinux + +COREUTILS_BINARIES = touch coreutils: $(DL_DIR)/$(COREUTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(COREUTILS_DIR) - $(UNTAR)/$(COREUTILS_SOURCE) - $(CHDIR)/$(COREUTILS_DIR); \ - $(call apply_patches,$(COREUTILS_PATCH)); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(base_prefix) \ - --bindir=/bin.$(@F) \ - --libexecdir=$(REMOVE_libexecdir) \ - --datarootdir=$(REMOVE_datarootdir) \ - --enable-silent-rules \ - --disable-xattr \ - --disable-libcap \ - --disable-acl \ - --without-gmp \ - --without-selinux \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - for bin in $(COREUTILS_BIN); do \ + for bin in $($(PKG)_BINARIES); do \ rm -f $(TARGET_base_bindir)/$$bin; \ - $(INSTALL_EXEC) -D $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_base_bindir)/$$bin; \ + $(INSTALL_EXEC) -D $(TARGET_base_bindir).$(@F)/$$bin $(TARGET_base_bindir)/$$bin; \ done - $(REMOVE)/$(COREUTILS_DIR) \ - $(TARGET_DIR)/bin.$(@F) + rm -r $(TARGET_base_bindir).$(@F) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -PROCPS-NG_VER = 3.3.16 -PROCPS-NG_DIR = procps-ng-$(PROCPS-NG_VER) -PROCPS-NG_SOURCE = procps-ng-$(PROCPS-NG_VER).tar.xz -PROCPS-NG_SITE = http://sourceforge.net/projects/procps-ng/files/Production - -$(DL_DIR)/$(PROCPS-NG_SOURCE): - $(DOWNLOAD) $(PROCPS-NG_SITE)/$(PROCPS-NG_SOURCE) - -PROCPS-NG_PATCH = procps-ng-no-tests-docs.patch - -PROCPS-NG_DEPS = ncurses - -PROCPS-NG_BIN = ps top - -procps-ng: $(PROCPS-NG_DEPS) $(DL_DIR)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(PROCPS-NG_DIR) - $(UNTAR)/$(PROCPS-NG_SOURCE) - $(CHDIR)/$(PROCPS-NG_DIR); \ - $(call apply_patches,$(PROCPS-NG_PATCH)); \ - export ac_cv_func_malloc_0_nonnull=yes; \ - export ac_cv_func_realloc_0_nonnull=yes; \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(base_prefix) \ - --bindir=/bin.$(@F) \ - --sbindir=/sbin.$(@F) \ - --includedir=$(includedir) \ - --libdir=$(libdir) \ - --datarootdir=$(REMOVE_datarootdir) \ - --without-systemd \ - ; \ +PROCPS_NG_VER = 3.3.16 +PROCPS_NG_DIR = procps-ng-$(PROCPS_NG_VER) +PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VER).tar.xz +PROCPS_NG_SITE = http://sourceforge.net/projects/procps-ng/files/Production + +$(DL_DIR)/$(PROCPS_NG_SOURCE): + $(DOWNLOAD) $(PROCPS_NG_SITE)/$(PROCPS_NG_SOURCE) + +PROCPS_NG_DEPS = ncurses + +PROCPS_NG_AUTORECONF = YES + +PROCPS_NG_CONF_ENV = \ + ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes + +PROCPS_NG_CONF_OPTS = \ + --prefix=$(base_prefix) \ + --exec_prefix=$(base_prefix) \ + --includedir=$(includedir) \ + --libdir=$(libdir) \ + --bindir=$(base_bindir).$(@F) \ + --sbindir=$(base_sbindir).$(@F) \ + --docdir=$(REMOVE_docdir) \ + --without-systemd + +PROCPS_NG_BINARIES = ps top + +procps-ng: $(PROCPS_NG_DEPS) $(DL_DIR)/$(PROCPS_NG_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - for bin in $(PROCPS-NG_BIN); do \ - rm -f $(TARGET_bindir)/$$bin; \ - $(INSTALL_EXEC) -D $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_bindir)/$$bin; \ + for bin in $($(PKG)_BINARIES); do \ + rm -f $(TARGET_base_bindir)/$$bin; \ + $(INSTALL_EXEC) -D $(TARGET_base_bindir).$(@F)/$$bin $(TARGET_base_bindir)/$$bin; \ done - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(PROCPS-NG_DIR) \ - $(TARGET_DIR)/bin.$(@F) \ - $(TARGET_DIR)/sbin.$(@F) + rm -r $(TARGET_base_bindir).$(@F) + rm -r $(TARGET_base_sbindir).$(@F) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -MTD-UTILS_VER = 2.0.2 -MTD-UTILS_DIR = mtd-utils-$(MTD-UTILS_VER) -MTD-UTILS_SOURCE = mtd-utils-$(MTD-UTILS_VER).tar.bz2 -MTD-UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils +MTD_UTILS_VER = 2.0.2 +MTD_UTILS_DIR = mtd-utils-$(MTD_UTILS_VER) +MTD_UTILS_SOURCE = mtd-utils-$(MTD_UTILS_VER).tar.bz2 +MTD_UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils + +$(DL_DIR)/$(MTD_UTILS_SOURCE): + $(DOWNLOAD) $(MTD_UTILS_SITE)/$(MTD_UTILS_SOURCE) -$(DL_DIR)/$(MTD-UTILS_SOURCE): - $(DOWNLOAD) $(MTD-UTILS_SITE)/$(MTD-UTILS_SOURCE) +MTD_UTILS_DEPS = -MTD-UTILS_DEPS = zlib lzo e2fsprogs +MTD_UTILS_CONF_OPTS = \ + --prefix=$(base_prefix) \ + --exec_prefix=$(base_prefix) \ + --includedir=$(includedir) \ + --libdir=$(libdir) \ + --sbindir=$(base_sbindir).$(@F) \ + --mandir=$(REMOVE_mandir) \ + --disable-tests \ + --without-zstd \ + --without-ubifs \ + --without-xattr + +ifeq ($(BOXSERIES),hd2) + MTD_UTILS_DEPS += zlib lzo + MTD_UTILS_CONF_OPTS += --with-jffs +else + MTD_UTILS_CONF_OPTS += --without-jffs +endif -MTD-UTILS_SBIN = flash_erase flash_eraseall +MTD_UTILS_SBINARIES = flash_erase flash_eraseall ifeq ($(BOXSERIES),hd2) - MTD-UTILS_SBIN+= nanddump nandtest nandwrite mkfs.jffs2 + MTD_UTILS_SBINARIES += nanddump nandtest nandwrite mkfs.jffs2 endif -mtd-utils: $(MTD-UTILS_DEPS) $(DL_DIR)/$(MTD-UTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(MTD-UTILS_DIR) - $(UNTAR)/$(MTD-UTILS_SOURCE) - $(CHDIR)/$(MTD-UTILS_DIR); \ - $(CONFIGURE) \ - --prefix=$(base_prefix) \ - --sbindir=/sbin.$(@F) \ - --mandir=$(REMOVE_mandir) \ - --enable-silent-rules \ - --disable-tests \ - --without-xattr \ - ; \ +mtd-utils: $(MTD_UTILS_DEPS) $(DL_DIR)/$(MTD_UTILS_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - for sbin in $(MTD-UTILS_SBIN); do \ - rm -f $(TARGET_base_sbindir)/$$sbin; \ - $(INSTALL_EXEC) -D $(TARGET_DIR)/sbin.$(@F)/$$sbin $(TARGET_base_sbindir); \ + for sbin in $($(PKG)_SBINARIES); do \ + rm -f $(TARGET_sbindir)/$$sbin; \ + $(INSTALL_EXEC) -D $(TARGET_base_sbindir).$(@F)/$$sbin $(TARGET_base_sbindir)/$$sbin; \ done - $(REMOVE)/$(MTD-UTILS_DIR) \ - $(TARGET_DIR)/sbin.$(@F) + rm -r $(TARGET_base_sbindir).$(@F) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -322,117 +341,126 @@ DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v $(DL_DIR)/$(DOSFSTOOLS_SOURCE): $(DOWNLOAD) $(DOSFSTOOLS_SITE)/$(DOSFSTOOLS_SOURCE) -DOSFSTOOLS_PATCH = switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch - DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fomit-frame-pointer +DOSFSTOOLS_AUTORECONF = YES + +DOSFSTOOLS_CONF_OPTS = \ + --prefix=$(base_prefix) \ + --exec_prefix=$(base_prefix) \ + --docdir=$(REMOVE_docdir) \ + --without-udev \ + --enable-compat-symlinks \ + CFLAGS="$(DOSFSTOOLS_CFLAGS)" + dosfstools: $(DL_DIR)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(DOSFSTOOLS_DIR) - $(UNTAR)/$(DOSFSTOOLS_SOURCE) - $(CHDIR)/$(DOSFSTOOLS_DIR); \ - $(call apply_patches,$(addprefix $(@F)/,$(DOSFSTOOLS_PATCH))); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(base_prefix) \ - --mandir=$(REMOVE_mandir) \ - --docdir=$(REMOVE_docdir) \ - --without-udev \ - --enable-compat-symlinks \ - CFLAGS="$(DOSFSTOOLS_CFLAGS)" \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(DOSFSTOOLS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -NTFS-3G_VER = 2017.3.23 -NTFS-3G_DIR = ntfs-3g_ntfsprogs-$(NTFS-3G_VER) -NTFS-3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS-3G_VER).tgz -NTFS-3G_SITE = https://tuxera.com/opensource - -$(DL_DIR)/$(NTFS-3G_SOURCE): - $(DOWNLOAD) $(NTFS-3G_SITE)/$(NTFS-3G_SOURCE) - -NTFS-3G_DEPS = libfuse - -ntfs-3g: $(NTFS-3G_DEPS) $(DL_DIR)/$(NTFS-3G_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(NTFS-3G_DIR) - $(UNTAR)/$(NTFS-3G_SOURCE) - $(CHDIR)/$(NTFS-3G_DIR); \ +NTFS_3G_VER = 2017.3.23 +NTFS_3G_DIR = ntfs-3g_ntfsprogs-$(NTFS_3G_VER) +NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VER).tgz +NTFS_3G_SITE = https://tuxera.com/opensource + +$(DL_DIR)/$(NTFS_3G_SOURCE): + $(DOWNLOAD) $(NTFS_3G_SITE)/$(NTFS_3G_SOURCE) + +NTFS_3G_DEPS = libfuse + +NTFS_3G_CONF_OPTS = \ + --prefix=$(base_prefix) \ + --exec_prefix=$(base_prefix) \ + --includedir=$(includedir) \ + --libdir=$(libdir) \ + --docdir=$(REMOVE_docdir) \ + --disable-ntfsprogs \ + --disable-ldconfig \ + --disable-library \ + --with-fuse=external + +ntfs-3g: $(NTFS_3G_DEPS) $(DL_DIR)/$(NTFS_3G_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --bindir=$(base_bindir) \ - --sbindir=$(base_sbindir) \ - --mandir=$(REMOVE_mandir) \ - --docdir=$(REMOVE_docdir) \ - --disable-ntfsprogs \ - --disable-ldconfig \ - --disable-library \ - --with-fuse=external \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) -rm $(addprefix $(TARGET_base_bindir)/,lowntfs-3g ntfs-3g.probe) -rm $(addprefix $(TARGET_base_sbindir)/,mount.lowntfs-3g) ln -sf $(base_bindir)/ntfs-3g $(TARGET_base_sbindir)/mount.ntfs - $(REMOVE)/$(NTFS-3G_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -FUSE-EXFAT_VER = 1.3.0 -FUSE-EXFAT_DIR = fuse-exfat-$(FUSE-EXFAT_VER) -FUSE-EXFAT_SOURCE = fuse-exfat-$(FUSE-EXFAT_VER).tar.gz -FUSE-EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(FUSE-EXFAT_VER) - -$(DL_DIR)/$(FUSE-EXFAT_SOURCE): - $(DOWNLOAD) $(FUSE-EXFAT_SITE)/$(FUSE-EXFAT_SOURCE) - -FUSE-EXFAT_DEPS = libfuse - -fuse-exfat: $(FUSE-EXFAT_DEPS) $(DL_DIR)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FUSE-EXFAT_DIR) - $(UNTAR)/$(FUSE-EXFAT_SOURCE) - $(CHDIR)/$(FUSE-EXFAT_DIR); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(base_prefix) \ - --docdir=$(REMOVE_docdir) \ - --mandir=$(REMOVE_mandir) \ - ; \ +FUSE_EXFAT_VER = 1.3.0 +FUSE_EXFAT_DIR = fuse-exfat-$(FUSE_EXFAT_VER) +FUSE_EXFAT_SOURCE = fuse-exfat-$(FUSE_EXFAT_VER).tar.gz +FUSE_EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(FUSE_EXFAT_VER) + +$(DL_DIR)/$(FUSE_EXFAT_SOURCE): + $(DOWNLOAD) $(FUSE_EXFAT_SITE)/$(FUSE_EXFAT_SOURCE) + +FUSE_EXFAT_DEPS = libfuse + +FUSE_EXFAT_AUTORECONF = YES + +FUSE_EXFAT_CONF_OPTS = \ + --prefix=$(base_prefix) \ + --exec_prefix=$(base_prefix) \ + --includedir=$(includedir) \ + --libdir=$(libdir) \ + --docdir=$(REMOVE_docdir) + +fuse-exfat: $(FUSE_EXFAT_DEPS) $(DL_DIR)/$(FUSE_EXFAT_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(FUSE-EXFAT_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -EXFAT-UTILS_VER = 1.3.0 -EXFAT-UTILS_DIR = exfat-utils-$(EXFAT-UTILS_VER) -EXFAT-UTILS_SOURCE = exfat-utils-$(EXFAT-UTILS_VER).tar.gz -EXFAT-UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT-UTILS_VER) - -$(DL_DIR)/$(EXFAT-UTILS_SOURCE): - $(DOWNLOAD) $(EXFAT-UTILS_SITE)/$(EXFAT-UTILS_SOURCE) - -EXFAT-UTILS_DEPS = fuse-exfat - -exfat-utils: $(EXFAT-UTILS_DEPS) $(DL_DIR)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(EXFAT-UTILS_DIR) - $(UNTAR)/$(EXFAT-UTILS_SOURCE) - $(CHDIR)/$(EXFAT-UTILS_DIR); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(base_prefix) \ - --docdir=$(REMOVE_docdir) \ - --mandir=$(REMOVE_mandir) \ - ; \ +EXFAT_UTILS_VER = 1.3.0 +EXFAT_UTILS_DIR = exfat-utils-$(EXFAT_UTILS_VER) +EXFAT_UTILS_SOURCE = exfat-utils-$(EXFAT_UTILS_VER).tar.gz +EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VER) + +$(DL_DIR)/$(EXFAT_UTILS_SOURCE): + $(DOWNLOAD) $(EXFAT_UTILS_SITE)/$(EXFAT_UTILS_SOURCE) + +EXFAT_UTILS_DEPS = fuse-exfat + +EXFAT_UTILS_AUTORECONF = YES + +EXFAT_UTILS_CONF_OPTS = \ + --prefix=$(base_prefix) \ + --exec_prefix=$(base_prefix) \ + --includedir=$(includedir) \ + --libdir=$(libdir) \ + --docdir=$(REMOVE_docdir) + +exfat-utils: $(EXFAT_UTILS_DEPS) $(DL_DIR)/$(EXFAT_UTILS_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(EXFAT-UTILS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -445,7 +473,7 @@ XFSPROGS_SITE = $(KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs $(DL_DIR)/$(XFSPROGS_SOURCE): $(DOWNLOAD) $(XFSPROGS_SITE)/$(XFSPROGS_SOURCE) -XFSPROGS_DEPS = util-linux +XFSPROGS_DEPS = util-linux XFSPROGS_CONF_ENV = \ ac_cv_header_aio_h=yes \ @@ -462,18 +490,15 @@ XFSPROGS_CONF_OPTS = \ --enable-static xfsprogs: $(XFSPROGS_DEPS) $(DL_DIR)/$(XFSPROGS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(XFSPROGS_DIR) - $(UNTAR)/$(XFSPROGS_SOURCE) - $(CHDIR)/$(XFSPROGS_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - $(XFSPROGS_CONF_ENV) \ - $(CONFIGURE) \ - $(XFSPROGS_CONF_OPTS) \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DIST_ROOT=$(TARGET_DIR) - -rm -r $(addprefix $(TARGET_libdir)/, xfsprogs) - $(REMOVE)/$(XFSPROGS_DIR) + -rm -r $(addprefix $(TARGET_libdir)/,xfsprogs) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -487,47 +512,57 @@ E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$ $(DL_DIR)/$(E2FSPROGS_SOURCE): $(DOWNLOAD) $(E2FSPROGS_SITE)/$(E2FSPROGS_SOURCE) -e2fsprogs: $(DL_DIR)/$(E2FSPROGS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(E2FSPROGS_DIR) - $(UNTAR)/$(E2FSPROGS_SOURCE) - $(CHDIR)/$(E2FSPROGS_DIR); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --with-root-prefix=$(base_prefix)\ \ - --libdir=$(libdir) \ - --sysconfdir=$(sysconfdir) \ - --datarootdir=$(REMOVE_datarootdir) \ - --disable-nls \ - --disable-profile \ - --disable-e2initrd-helper \ - --disable-backtrace \ - --disable-bmap-stats \ - --disable-debugfs \ - --disable-fuse2fs \ - --disable-imager \ - --disable-mmp \ - --disable-rpath \ - --disable-tdb \ - --disable-uuidd \ - --disable-blkid-debug \ - --disable-jbd-debug \ - --disable-testio-debug \ - --disable-defrag \ - --enable-elf-shlibs \ - --enable-fsck \ - --enable-symlink-install \ - --enable-verbose-makecmds \ - --enable-symlink-build \ - --with-gnu-ld \ - --with-crond-dir=no \ - ; \ +#E2FSPROGS_DEPS = util-linux + +E2FSPROGS_AUTORECONF = YES + +#E2FSPROGS_CONF_ENV = \ +# ac_cv_path_LDCONFIG=true + +E2FSPROGS_CONF_OPTS = \ + --with-root-prefix="$(base_prefix)" \ + --datarootdir=$(REMOVE_datarootdir) \ + --disable-backtrace \ + --disable-blkid-debug \ + --disable-bmap-stats \ + --disable-debugfs \ + --disable-defrag \ + --disable-e2initrd-helper \ + --disable-fuse2fs \ + --disable-imager \ + --disable-jbd-debug \ + --disable-mmp \ + --disable-nls \ + --disable-profile \ + --disable-rpath \ + --disable-tdb \ + --disable-testio-debug \ + --disable-uuidd \ + --enable-elf-shlibs \ + --enable-fsck \ + --enable-symlink-install \ + --enable-verbose-makecmds \ + --enable-symlink-build \ + --with-gnu-ld \ + --with-crond-dir=no + +# --disable-libblkid \ +# --disable-libuuid \ + +# --without-libintl-prefix \ +# --without-libiconv-prefix \ + +e2fsprogs: $(E2FSPROGS_DEPS) $(DL_DIR)/$(E2FSPROGS_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE1) install install-libs DESTDIR=$(TARGET_DIR) - -rm $(addprefix $(TARGET_base_sbindir)/, dumpe2fs e2mmpstatus e2undo logsave) - -rm $(addprefix $(TARGET_bindir)/, chattr compile_et lsattr mk_cmds uuidgen) - -rm $(addprefix $(TARGET_sbindir)/, e2freefrag e4crypt filefrag) - $(REMOVE)/$(E2FSPROGS_DIR) + -rm $(addprefix $(TARGET_base_sbindir)/,dumpe2fs e2mmpstatus e2undo logsave) + -rm $(addprefix $(TARGET_bindir)/,chattr compile_et lsattr mk_cmds uuidgen) + -rm $(addprefix $(TARGET_sbindir)/,e2freefrag e4crypt filefrag) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -541,101 +576,110 @@ $(DL_DIR)/$(HDPARM_SOURCE): $(DOWNLOAD) $(HDPARM_SITE)/$(HDPARM_SOURCE) hdparm: $(DL_DIR)/$(HDPARM_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(HDPARM_DIR) - $(UNTAR)/$(HDPARM_SOURCE) - $(CHDIR)/$(HDPARM_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - $(MAKE_ENV) \ + $(TARGET_CONFIGURE_ENV) \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mandir=$(REMOVE_mandir) - $(REMOVE)/$(HDPARM_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -F2FS-TOOLS_VER = 1.14.0 -F2FS-TOOLS_DIR = f2fs-tools-$(F2FS-TOOLS_VER) -F2FS-TOOLS_SOURCE = f2fs-tools-$(F2FS-TOOLS_VER).tar.gz -F2FS-TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot - -$(DL_DIR)/$(F2FS-TOOLS_SOURCE): - $(DOWNLOAD) $(F2FS-TOOLS_SITE)/$(F2FS-TOOLS_SOURCE) - -F2FS-TOOLS_DEPS = util-linux - -f2fs-tools: $(F2FS-TOOLS_DEPS) $(DL_DIR)/$(F2FS-TOOLS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(F2FS-TOOLS_DIR) - $(UNTAR)/$(F2FS-TOOLS_SOURCE) - $(CHDIR)/$(F2FS-TOOLS_DIR); \ - autoreconf -fi; \ - ac_cv_file__git=no \ - $(CONFIGURE) \ - --prefix=$(base_prefix) \ - --mandir=$(REMOVE_mandir) \ - --without-selinux \ - ; \ +F2FS_TOOLS_VER = 1.14.0 +F2FS_TOOLS_DIR = f2fs-tools-$(F2FS_TOOLS_VER) +F2FS_TOOLS_SOURCE = f2fs-tools-$(F2FS_TOOLS_VER).tar.gz +F2FS_TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot + +$(DL_DIR)/$(F2FS_TOOLS_SOURCE): + $(DOWNLOAD) $(F2FS_TOOLS_SITE)/$(F2FS_TOOLS_SOURCE) + +F2FS_TOOLS_DEPS = util-linux + +F2FS_TOOLS_AUTORECONF = YES + +F2FS_TOOLS_CONF_ENV = \ + ac_cv_file__git=no + +F2FS_TOOLS_CONF_OPTS = \ + --prefix=$(base_prefix) \ + --exec_prefix=$(base_prefix) \ + --includedir=$(includedir) \ + --libdir=$(libdir) \ + --without-selinux + +f2fs-tools: $(F2FS_TOOLS_DEPS) $(DL_DIR)/$(F2FS_TOOLS_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(F2FS-TOOLS_DIR) + -rm $(addprefix $(TARGET_base_sbindir)/,sg_write_buffer) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -UTIL-LINUX_VER = 2.36.1 -UTIL-LINUX_DIR = util-linux-$(UTIL-LINUX_VER) -UTIL-LINUX_SOURCE = util-linux-$(UTIL-LINUX_VER).tar.xz -UTIL-LINUX_SITE = $(KERNEL_MIRROR)/linux/utils/util-linux/v$(basename $(UTIL-LINUX_VER)) - -$(DL_DIR)/$(UTIL-LINUX_SOURCE): - $(DOWNLOAD) $(UTIL-LINUX_SITE)/$(UTIL-LINUX_SOURCE) - -UTUL-LINUX_DEPS = ncurses zlib - -util-linux: $(UTUL-LINUX_DEPS) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(UTIL-LINUX_DIR) - $(UNTAR)/$(UTIL-LINUX_SOURCE) - $(CHDIR)/$(UTIL-LINUX_DIR); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --libdir=$(libdir) \ - --localedir=$(REMOVE_localedir) \ - --docdir=$(REMOVE_docdir) \ - --mandir=$(REMOVE_mandir) \ - --disable-hardlink \ - --disable-gtk-doc \ - \ - --disable-all-programs \ - \ - --enable-libfdisk \ - --enable-libsmartcols \ - --enable-libuuid \ - --enable-libblkid \ - --enable-libmount \ - \ - --disable-makeinstall-chown \ - --disable-makeinstall-setuid \ - --disable-makeinstall-chown \ - \ - --without-audit \ - --without-cap-ng \ - --without-btrfs \ - --without-ncursesw \ - --without-python \ - --without-readline \ - --without-slang \ - --without-smack \ - --without-libmagic \ - --without-systemd \ - --without-systemdsystemunitdir \ - --without-tinfo \ - --without-udev \ - --without-utempter \ - ; \ +UTIL_LINUX_VER = 2.36.2 +UTIL_LINUX_DIR = util-linux-$(UTIL_LINUX_VER) +UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VER).tar.xz +UTIL_LINUX_SITE = $(KERNEL_MIRROR)/linux/utils/util-linux/v$(basename $(UTIL_LINUX_VER)) + +$(DL_DIR)/$(UTIL_LINUX_SOURCE): + $(DOWNLOAD) $(UTIL_LINUX_SITE)/$(UTIL_LINUX_SOURCE) + +UTIL_LINUX_DEPS = ncurses zlib + +UTIL_LINUX_AUTORECONF = YES + +UTIL_LINUX_CONF_OPTS = \ + --includedir=$(includedir) \ + --libdir=$(libdir) \ + --runstatedir=$(runstatedir) \ + --localedir=$(REMOVE_localedir) \ + --docdir=$(REMOVE_docdir) \ + --disable-gtk-doc \ + \ + --disable-all-programs \ + \ + --enable-libfdisk \ + --enable-libsmartcols \ + --enable-libuuid \ + --enable-libblkid \ + --enable-libmount \ + \ + --disable-makeinstall-chown \ + --disable-makeinstall-setuid \ + --disable-makeinstall-chown \ + \ + --without-audit \ + --without-cap-ng \ + --without-btrfs \ + --without-ncursesw \ + --without-python \ + --without-readline \ + --without-slang \ + --without-smack \ + --without-libmagic \ + --without-systemd \ + --without-systemdsystemunitdir \ + --without-tinfo \ + --without-udev \ + --without-utempter + +util-linux: $(UTIL_LINUX_DEPS) $(DL_DIR)/$(UTIL_LINUX_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(UTIL-LINUX_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -653,33 +697,34 @@ OPENVPN_SITE = http://build.openvpn.net/downloads/releases $(DL_DIR)/$(OPENVPN_SOURCE): $(DOWNLOAD) $(OPENVPN_SITE)/$(OPENVPN_SOURCE) -OPENVPN_DEPS = lzo openssl +OPENVPN_DEPS = lzo openssl + +OPENVPN_CONF_ENV = \ + NETSTAT="/bin/netstat" \ + IFCONFIG="/sbin/ifconfig" \ + IPROUTE="/sbin/ip" \ + ROUTE="/sbin/route" + +OPENVPN_CONF_OPTS = \ + --docdir=$(REMOVE_docdir) \ + --infodir=$(REMOVE_infodir) \ + --enable-shared \ + --disable-static \ + --enable-small \ + --enable-management \ + --disable-debug \ + --disable-selinux \ + --disable-plugins \ + --disable-pkcs11 openvpn: $(OPENVPN_DEPS) $(DL_DIR)/$(OPENVPN_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(OPENVPN_DIR) - $(UNTAR)/$(OPENVPN_SOURCE) - $(CHDIR)/$(OPENVPN_DIR); \ - $(CONFIGURE) \ - IFCONFIG="/sbin/ifconfig" \ - NETSTAT="/bin/netstat" \ - ROUTE="/sbin/route" \ - IPROUTE="/sbin/ip" \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --docdir=$(REMOVE_docdir) \ - --infodir=$(REMOVE_infodir) \ - --enable-shared \ - --disable-static \ - --enable-small \ - --enable-management \ - --disable-debug \ - --disable-selinux \ - --disable-plugins \ - --disable-pkcs11 \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(OPENVPN_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -692,42 +737,41 @@ OPENSSH_SITE = https://artfiles.org/openbsd/OpenSSH/portable $(DL_DIR)/$(OPENSSH_SOURCE): $(DOWNLOAD) $(OPENSSH_SITE)/$(OPENSSH_SOURCE) -OPENSSH_DEPS = openssl zlib +OPENSSH_DEPS = openssl zlib + +OPENSSH_CONF_ENV = \ + ac_cv_search_dlopen=no + +OPENSSH_CONF_OPTS = \ + --docdir=$(REMOVE_docdir) \ + --sysconfdir=$(sysconfdir)/ssh \ + --libexecdir=$(sbindir) \ + --with-pid-dir=/tmp \ + --with-privsep-path=/var/empty \ + --with-cppflags="-pipe $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_ABI) -I$(TARGET_includedir)" \ + --with-ldflags="-L$(TARGET_libdir)" \ + --disable-strip \ + --disable-lastlog \ + --disable-utmp \ + --disable-utmpx \ + --disable-wtmp \ + --disable-wtmpx \ + --disable-pututline \ + --disable-pututxline openssh: $(OPENSSH_DEPS) $(DL_DIR)/$(OPENSSH_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(OPENSSH_DIR) - $(UNTAR)/$(OPENSSH_SOURCE) - $(CHDIR)/$(OPENSSH_DIR); \ - export ac_cv_search_dlopen=no; \ - ./configure \ - $(CONFIGURE_OPTS) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --docdir=$(REMOVE_docdir) \ - --infodir=$(REMOVE_infodir) \ - --sysconfdir=$(sysconfdir)/ssh \ - --libexecdir=$(sbindir) \ - --with-pid-dir=/tmp \ - --with-privsep-path=/var/empty \ - --with-cppflags="-pipe $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_ABI) -I$(TARGET_includedir)" \ - --with-ldflags="-L$(TARGET_libdir)" \ - --disable-strip \ - --disable-lastlog \ - --disable-utmp \ - --disable-utmpx \ - --disable-wtmp \ - --disable-wtmpx \ - --disable-pututline \ - --disable-pututxline \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $($(PKG)_CONF_ENV) ./configure $(TARGET_CONFIGURE_OPTS); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(OPENSSH_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -TZDATA_VER = 2020d +TZDATA_VER = 2020f TZDATA_DIR = tzdata$(TZDATA_VER) TZDATA_SOURCE = tzdata$(TZDATA_VER).tar.gz TZDATA_SITE = ftp://ftp.iana.org/tz/releases @@ -735,7 +779,7 @@ TZDATA_SITE = ftp://ftp.iana.org/tz/releases $(DL_DIR)/$(TZDATA_SOURCE): $(DOWNLOAD) $(TZDATA_SITE)/$(TZDATA_SOURCE) -TZDATA_DEPS = $(HOST_ZIC) +TZDATA_DEPS = host-zic TZDATA_ZONELIST = \ africa antarctica asia australasia europe northamerica \ @@ -746,10 +790,10 @@ TZDATA_LOCALTIME = CET ETC_LOCALTIME = $(if $(filter $(PERSISTENT_VAR_PARTITION),yes),/var/etc/localtime,/etc/localtime) tzdata: $(TZDATA_DEPS) $(DL_DIR)/$(TZDATA_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(TZDATA_DIR) - $(MKDIR)/$(TZDATA_DIR) - $(CHDIR)/$(TZDATA_DIR); \ - tar -xf $(DL_DIR)/$(TZDATA_SOURCE); \ + $(REMOVE)/$(PKG_DIR) + $(MKDIR)/$(PKG_DIR) + $(CHDIR)/$(PKG_DIR); \ + tar -xf $(DL_DIR)/$(PKG_SOURCE); \ unset ${!LC_*}; LANG=POSIX; LC_ALL=POSIX; export LANG LC_ALL; \ $(HOST_ZIC) -b fat -d zoneinfo.tmp $(TZDATA_ZONELIST); \ sed -n '/zone=/{s/.*zone="\(.*\)".*$$/\1/; p}' $(TARGET_FILES)/tzdata/timezone.xml | sort -u | \ @@ -762,7 +806,7 @@ tzdata: $(TZDATA_DEPS) $(DL_DIR)/$(TZDATA_SOURCE) | $(TARGET_DIR) $(INSTALL_DATA) -D $(TARGET_FILES)/tzdata/timezone.xml $(TARGET_sysconfdir)/timezone.xml ln -sf $(datadir)/zoneinfo/$(TZDATA_LOCALTIME) $(TARGET_DIR)$(ETC_LOCALTIME) echo "$(TZDATA_LOCALTIME)" > $(TARGET_sysconfdir)/timezone - $(REMOVE)/$(TZDATA_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -775,25 +819,20 @@ IPERF_SITE = https://iperf.fr/download/source $(DL_DIR)/$(IPERF_SOURCE): $(DOWNLOAD) $(IPERF_SITE)/$(IPERF_SOURCE) -IPERF_PATCH = iperf-disable-profiling.patch - iperf: $(DL_DIR)/$(IPERF_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(IPERF_DIR) - $(UNTAR)/$(IPERF_SOURCE) - $(CHDIR)/$(IPERF_DIR); \ - $(call apply_patches,$(IPERF_PATCH)); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(IPERF_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -PARTED_VER = 3.2 +PARTED_VER = 3.3 PARTED_DIR = parted-$(PARTED_VER) PARTED_SOURCE = parted-$(PARTED_VER).tar.xz PARTED_SITE = $(GNU_MIRROR)/parted @@ -801,55 +840,49 @@ PARTED_SITE = $(GNU_MIRROR)/parted $(DL_DIR)/$(PARTED_SOURCE): $(DOWNLOAD) $(PARTED_SITE)/$(PARTED_SOURCE) -PARTED_PATCH = parted-device-mapper.patch -PARTED_PATCH += parted-sysmacros.patch -PARTED_PATCH += parted-iconv.patch +PARTED_DEPS = e2fsprogs libiconv + +PARTED_AUTORECONF = YES -PARTED_DEPS = e2fsprogs +PARTED_CONF_OPTS = \ + --disable-shared \ + --enable-static \ + --disable-debug \ + --disable-pc98 \ + --disable-nls \ + --disable-device-mapper \ + --without-readline parted: $(PARTED_DEPS) $(DL_DIR)/$(PARTED_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(PARTED_DIR) - $(UNTAR)/$(PARTED_SOURCE) - $(CHDIR)/$(PARTED_DIR); \ - $(call apply_patches,$(PARTED_PATCH)); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --infodir=$(REMOVE_infodir) \ - --enable-silent-rules \ - --enable-shared \ - --disable-static \ - --disable-debug \ - --disable-pc98 \ - --disable-nls \ - --disable-device-mapper \ - --without-readline \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(PARTED_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -HD-IDLE_VER = 1.05 -HD-IDLE_DIR = hd-idle -HD-IDLE_SOURCE = hd-idle-$(HD-IDLE_VER).tgz -HD-IDLE_SITE = https://sourceforge.net/projects/hd-idle/files +HD_IDLE_VER = 1.05 +HD_IDLE_DIR = hd-idle +HD_IDLE_SOURCE = hd-idle-$(HD_IDLE_VER).tgz +HD_IDLE_SITE = https://sourceforge.net/projects/hd-idle/files -$(DL_DIR)/$(HD-IDLE_SOURCE): - $(DOWNLOAD) $(HD-IDLE_SITE)/$(HD-IDLE_SOURCE) +$(DL_DIR)/$(HD_IDLE_SOURCE): + $(DOWNLOAD) $(HD_IDLE_SITE)/$(HD_IDLE_SOURCE) -hd-idle: $(DL_DIR)/$(HD-IDLE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(HD-IDLE_DIR) - $(UNTAR)/$(HD-IDLE_SOURCE) - $(CHDIR)/$(HD-IDLE_DIR); \ - $(MAKE_ENV) \ +hd-idle: $(DL_DIR)/$(HD_IDLE_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(TARGET_CONFIGURE_ENV) \ $(MAKE); \ $(INSTALL_EXEC) -D hd-idle $(TARGET_sbindir)/hd-idle - $(REMOVE)/$(HD-IDLE_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -862,19 +895,16 @@ LESS_SITE = $(GNU_MIRROR)/less $(DL_DIR)/$(LESS_SOURCE): $(DOWNLOAD) $(LESS_SITE)/$(LESS_SOURCE) -LESS_DEPS = ncurses +LESS_DEPS = ncurses less: $(LESS_DEPS) $(DL_DIR)/$(LESS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LESS_DIR) - $(UNTAR)/$(LESS_SOURCE) - $(CHDIR)/$(LESS_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(LESS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -887,25 +917,26 @@ NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(basename $(NTP $(DL_DIR)/$(NTP_SOURCE): $(DOWNLOAD) $(NTP_SITE)/$(NTP_SOURCE) -NTP_DEPS = openssl +NTP_DEPS = openssl + +NTP_CONF_OPTS = \ + --docdir=$(REMOVE_docdir) \ + --disable-debugging \ + --with-shared \ + --with-crypto \ + --with-yielding-select=yes \ + --without-ntpsnmpd ntp: $(NTP_DEPS) $(DL_DIR)/$(NTP_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(NTP_DIR) - $(UNTAR)/$(NTP_SOURCE) - $(CHDIR)/$(NTP_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --disable-debugging \ - --with-shared \ - --with-crypto \ - --with-yielding-select=yes \ - --without-ntpsnmpd \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(INSTALL_EXEC) -D ntpdate/ntpdate $(TARGET_sbindir)/ntpdate $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/ntpdate.init $(TARGET_sysconfdir)/init.d/ntpdate - $(REMOVE)/$(NTP_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -918,33 +949,26 @@ DJMOUNT_SITE = https://sourceforge.net/projects/djmount/files/djmount/$(DJMOUN $(DL_DIR)/$(DJMOUNT_SOURCE): $(DOWNLOAD) $(DJMOUNT_SITE)/$(DJMOUNT_SOURCE) -DJMOUNT_PATCH = djmount-fix-hang-with-asset-upnp.patch -DJMOUNT_PATCH += djmount-fix-incorrect-range-when-retrieving-content-via-HTTP.patch -DJMOUNT_PATCH += djmount-fix-new-autotools.diff -DJMOUNT_PATCH += djmount-fix-newer-gcc.patch -DJMOUNT_PATCH += djmount-fixed-crash-when-using-UTF-8-charset.patch -DJMOUNT_PATCH += djmount-fixed-crash.patch -DJMOUNT_PATCH += djmount-support-fstab-mounting.diff -DJMOUNT_PATCH += djmount-support-seeking-in-large-2gb-files.patch +DJMOUNT_DEPS = libfuse + +DJMOUNT_AUTORECONF = YES -DJMOUNT_DEPS = libfuse +DJMOUNT_CONF_OPTS = \ + --with-fuse-prefix=$(TARGET_prefix) \ + --disable-debug djmount: $(DJMOUNT_DEPS) $(DL_DIR)/$(DJMOUNT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(DJMOUNT_DIR) - $(UNTAR)/$(DJMOUNT_SOURCE) - $(CHDIR)/$(DJMOUNT_DIR); \ - $(call apply_patches,$(DJMOUNT_PATCH)); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ touch libupnp/config.aux/config.rpath; \ - autoreconf -fi; \ - $(CONFIGURE) -C \ - --prefix=$(prefix) \ - --disable-debug \ - ; \ - make; \ - make install DESTDIR=$(TARGET_DIR) + $(CONFIGURE); \ + $(MAKE1); \ + $(MAKE1) install DESTDIR=$(TARGET_DIR) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/djmount.init $(TARGET_sysconfdir)/init.d/djmount $(UPDATE-RC.D) djmount defaults 75 25 - $(REMOVE)/$(DJMOUNT_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -957,26 +981,22 @@ USHARE_SITE = https://github.com/GeeXboX/ushare/archive $(DL_DIR)/$(USHARE_SOURCE): $(DOWNLOAD) $(USHARE_SITE)/$(USHARE_SOURCE) -USHARE_PATCH = ushare.diff -USHARE_PATCH += ushare-fix-building-with-gcc-5.x.patch -USHARE_PATCH += ushare-disable-iconv-check.patch +USHARE_DEPS = libupnp -USHARE_DEPS = libupnp +USHARE_CONF_OPTS = \ + --prefix=$(prefix) \ + --sysconfdir=$(sysconfdir) \ + --disable-dlna \ + --disable-nls \ + --cross-compile \ + --cross-prefix=$(TARGET_CROSS) ushare: $(USHARE_DEPS) $(DL_DIR)/$(USHARE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(USHARE_DIR) - $(UNTAR)/$(USHARE_SOURCE) - $(CHDIR)/$(USHARE_DIR); \ - $(call apply_patches,$(USHARE_PATCH)); \ - $(MAKE_ENV) \ - ./configure \ - --prefix=$(prefix) \ - --sysconfdir=$(sysconfdir) \ - --disable-dlna \ - --disable-nls \ - --cross-compile \ - --cross-prefix=$(TARGET_CROSS) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(TARGET_CONFIGURE_ENV) ./configure $($(PKG)_CONF_OPTS); \ ln -sf ../config.h src/; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -984,7 +1004,7 @@ ushare: $(USHARE_DEPS) $(DL_DIR)/$(USHARE_SOURCE) | $(TARGET_DIR) $(SED) 's|%(BOXTYPE)|$(BOXTYPE)|; s|%(BOXMODEL)|$(BOXMODEL)|' $(TARGET_sysconfdir)/ushare.conf $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/ushare.init $(TARGET_sysconfdir)/init.d/ushare $(UPDATE-RC.D) ushare defaults 75 25 - $(REMOVE)/$(USHARE_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -997,19 +1017,18 @@ SQLITE_SITE = http://www.sqlite.org/2020 $(DL_DIR)/$(SQLITE_SOURCE): $(DOWNLOAD) $(SQLITE_SITE)/$(SQLITE_SOURCE) +SQLITE_CONF_OPTS = \ + --bindir=$(REMOVE_bindir) + sqlite: $(DL_DIR)/$(SQLITE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SQLITE_DIR) - $(UNTAR)/$(SQLITE_SOURCE) - $(CHDIR)/$(SQLITE_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --bindir=$(REMOVE_bindir) \ - --mandir=$(REMOVE_mandir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(SQLITE_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1022,19 +1041,20 @@ MINIDLNA_SITE = https://sourceforge.net/projects/minidlna/files/minidlna/$(MIN $(DL_DIR)/$(MINIDLNA_SOURCE): $(DOWNLOAD) $(MINIDLNA_SITE)/$(MINIDLNA_SOURCE) -MINIDLNA_DEPS = zlib sqlite libexif libjpeg-turbo libid3tag libogg libvorbis flac ffmpeg +MINIDLNA_DEPS = zlib sqlite libexif libjpeg-turbo libid3tag libogg libvorbis flac ffmpeg + +MINIDLNA_AUTORECONF = YES + +MINIDLNA_CONF_OPTS = \ + --localedir=$(REMOVE_localedir) \ + --with-log-path=/tmp/minidlna \ + --disable-static minidlna: $(MINIDLNA_DEPS) $(DL_DIR)/$(MINIDLNA_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(MINIDLNA_DIR) - $(UNTAR)/$(MINIDLNA_SOURCE) - $(CHDIR)/$(MINIDLNA_DIR); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --localedir=$(REMOVE_localedir) \ - --with-log-path=/tmp/minidlna \ - --disable-static \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(INSTALL_DATA) -D $(PKG_BUILD_DIR)/minidlna.conf $(TARGET_sysconfdir)/minidlna.conf @@ -1043,7 +1063,7 @@ minidlna: $(MINIDLNA_DEPS) $(DL_DIR)/$(MINIDLNA_SOURCE) | $(TARGET_DIR) $(SED) 's|^#friendly_name=.*|friendly_name=$(BOXTYPE)-$(BOXMODEL):ReadyMedia|' $(TARGET_sysconfdir)/minidlna.conf $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/minidlnad.init $(TARGET_sysconfdir)/init.d/minidlnad $(UPDATE-RC.D) minidlnad defaults 75 25 - $(REMOVE)/$(MINIDLNA_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1057,15 +1077,13 @@ $(DL_DIR)/$(SMARTMONTOOLS_SOURCE): $(DOWNLOAD) $(SMARTMONTOOLS_SITE)/$(SMARTMONTOOLS_SOURCE) smartmontools: $(DL_DIR)/$(SMARTMONTOOLS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SMARTMONTOOLS_DIR) - $(UNTAR)/$(SMARTMONTOOLS_SOURCE) - $(CHDIR)/$(SMARTMONTOOLS_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(INSTALL_EXEC) -D smartctl $(TARGET_sbindir)/smartctl - $(REMOVE)/$(SMARTMONTOOLS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1078,21 +1096,19 @@ INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_ $(DL_DIR)/$(INADYN_SOURCE): $(DOWNLOAD) $(INADYN_SITE)/$(INADYN_SOURCE) -INADYN_DEPS = openssl confuse libite +INADYN_DEPS = openssl confuse libite + +INADYN_AUTORECONF = YES + +INADYN_CONF_OPTS = \ + --docdir=$(REMOVE_docdir) \ + --enable-openssl inadyn: $(INADYN_DEPS) $(DL_DIR)/$(INADYN_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(INADYN_DIR) $(UNTAR)/$(INADYN_SOURCE) $(CHDIR)/$(INADYN_DIR); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --sysconfdir=$(sysconfdir) \ - --localstatedir=$(localstatedir) \ - --mandir=$(REMOVE_mandir) \ - --docdir=$(REMOVE_docdir) \ - --enable-openssl \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(INSTALL_DATA) -D $(TARGET_FILES)/configs/inadyn.conf $(TARGET_localstatedir)/etc/inadyn.conf @@ -1112,29 +1128,26 @@ VSFTPD_SITE = https://security.appspot.com/downloads $(DL_DIR)/$(VSFTPD_SOURCE): $(DOWNLOAD) $(VSFTPD_SITE)/$(VSFTPD_SOURCE) -VSFTPD_PATCH = vsftpd-fix-CVE-2015-1419.patch -VSFTPD_PATCH += vsftpd-disable-capabilities.patch -VSFTPD_PATCH += vsftpd-fixchroot.patch -VSFTPD_PATCH += vsftpd-login-blank-password.patch +VSFTPD_LIBS += -lcrypt $$($(PKG_CONFIG) --libs libssl libcrypto) -VSFTPD_DEPS = openssl +VSFTPD_DEPS = openssl vsftpd: $(VSFTPD_DEPS) $(DL_DIR)/$(VSFTPD_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(VSFTPD_DIR) - $(UNTAR)/$(VSFTPD_SOURCE) - $(CHDIR)/$(VSFTPD_DIR); \ - $(call apply_patches,$(VSFTPD_PATCH)); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ $(SED) 's/.*VSF_BUILD_PAM/#undef VSF_BUILD_PAM/' builddefs.h; \ $(SED) 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h; \ $(MAKE) clean; \ - $(MAKE) $(MAKE_ENV) LIBS="-lcrypt -lcrypto -lssl"; \ + $(MAKE) $(TARGET_CONFIGURE_ENV) LIBS="$($(PKG)_LIBS)"; \ $(INSTALL_EXEC) -D vsftpd $(TARGET_sbindir)/vsftpd mkdir -p $(TARGET_datadir)/empty $(INSTALL_DATA) -D $(TARGET_FILES)/configs/vsftpd.conf $(TARGET_sysconfdir)/vsftpd.conf $(INSTALL_DATA) -D $(TARGET_FILES)/configs/vsftpd.chroot_list $(TARGET_sysconfdir)/vsftpd.chroot_list $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vsftpd.init $(TARGET_sysconfdir)/init.d/vsftpd $(UPDATE-RC.D) vsftpd defaults 75 25 - $(REMOVE)/$(VSFTPD_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1147,27 +1160,29 @@ NANO_SITE = $(GNU_MIRROR)/nano $(DL_DIR)/$(NANO_SOURCE): $(DOWNLOAD) $(NANO_SITE)/$(NANO_SOURCE) -NANO_DEPS = ncurses +NANO_DEPS = ncurses + +NANO_CONF_ENV = \ + ac_cv_prog_NCURSESW_CONFIG=false + +NANO_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + --disable-nls \ + --disable-libmagic \ + --enable-tiny \ + --without-slang \ + --with-wordbounds nano: $(NANO_DEPS) $(DL_DIR)/$(NANO_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(NANO_DIR) - $(UNTAR)/$(NANO_SOURCE) - $(CHDIR)/$(NANO_DIR); \ - export ac_cv_prog_NCURSESW_CONFIG=false; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --disable-nls \ - --disable-libmagic \ - --enable-tiny \ - --without-slang \ - --with-wordbounds \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE) CURSES_LIB="-lncurses"; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(INSTALL) -d $(TARGET_sysconfdir)/profile.d echo "export EDITOR=nano" > $(TARGET_sysconfdir)/profile.d/editor.sh - $(REMOVE)/$(NANO_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1180,22 +1195,20 @@ MINICOM_SITE = http://fossies.org/linux/misc $(DL_DIR)/$(MINICOM_SOURCE): $(DOWNLOAD) $(MINICOM_SITE)/$(MINICOM_SOURCE) -MINICOM_PATCH = minicom-fix-h-v-return-value-is-not-0.patch +MINICOM_DEPS = ncurses -MINICOM_DEPS = ncurses +MINICOM_CONF_OPTS = \ + --disable-nls minicom: $(MINICOM_DEPS) $(DL_DIR)/$(MINICOM_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(MINICOM_DIR) - $(UNTAR)/$(MINICOM_SOURCE) - $(CHDIR)/$(MINICOM_DIR); \ - $(call apply_patches,$(MINICOM_PATCH)); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --disable-nls \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(INSTALL_EXEC) src/minicom $(TARGET_bindir) - $(REMOVE)/$(MINICOM_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1208,53 +1221,54 @@ AUTOFS_SITE = $(KERNEL_MIRROR)/linux/daemons/autofs/v5 $(DL_DIR)/$(AUTOFS_SOURCE): $(DOWNLOAD) $(AUTOFS_SITE)/$(AUTOFS_SOURCE) -# cd $(PATCHES)\autofs +# cd package/autofs/patches # wget -N https://mirrors.edge.kernel.org/pub/linux/daemons/autofs/v5/patches-5.1.6/patch_order_5.1.5 # for p in $(cat patch_order_5.1.5); do test -f $p || wget https://mirrors.edge.kernel.org/pub/linux/daemons/autofs/v5/patches-5.1.6/$p; done -AUTOFS_PATCH = force-STRIP-to-emtpy.patch -#AUTOFS_PATCH += $(shell cat $(PATCHES)/autofs/patch_order_$(AUTOFS_VER)) +AUTOFS_DEPS = libtirpc -AUTOFS_DEPS = libtirpc +AUTOFS_AUTORECONF = YES + +AUTOFS_CONF_ENV = \ + ac_cv_linux_procfs=yes \ + ac_cv_path_KRB5_CONFIG=no \ + ac_cv_path_MODPROBE=/sbin/modprobe \ + ac_cv_path_RANLIB=$(TARGET_RANLIB) \ + +AUTOFS_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + --enable-ignore-busy \ + --disable-mount-locking \ + --without-openldap \ + --without-sasl \ + --with-path=$(PATH) \ + --with-libtirpc \ + --with-hesiod=no \ + --with-confdir=/etc \ + --with-mapdir=/etc \ + --with-fifodir=/var/run \ + --with-flagdir=/var/run + +AUTOFS_MAKE_OPTS = \ + SUBDIRS="lib daemon modules" autofs: $(AUTOFS_DEPS) $(DL_DIR)/$(AUTOFS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(AUTOFS_DIR) - $(UNTAR)/$(AUTOFS_SOURCE) - $(CHDIR)/$(AUTOFS_DIR); \ - $(call apply_patches,$(addprefix $(@F)/,$(AUTOFS_PATCH))); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ $(SED) "s|nfs/nfs.h|linux/nfs.h|" include/rpc_subs.h; \ - export ac_cv_linux_procfs=yes; \ - export ac_cv_path_KRB5_CONFIG=no; \ - export ac_cv_path_MODPROBE=/sbin/modprobe; \ - export ac_cv_path_RANLIB=$(TARGET_RANLIB); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --enable-ignore-busy \ - --disable-mount-locking \ - --without-openldap \ - --without-sasl \ - --with-path=$(PATH) \ - --with-libtirpc \ - --with-hesiod=no \ - --with-confdir=/etc \ - --with-mapdir=/etc \ - --with-fifodir=/var/run \ - --with-flagdir=/var/run \ - ; \ - $(MAKE) SUBDIRS="lib daemon modules" DONTSTRIP=1; \ - $(MAKE) SUBDIRS="lib daemon modules" install DESTDIR=$(TARGET_DIR) + $(CONFIGURE); \ + $(MAKE) $($(PKG)_MAKE_OPTS) DONTSTRIP=1; \ + $(MAKE) $($(PKG)_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) $(INSTALL_COPY) $(TARGET_FILES)/autofs/* $(TARGET_DIR)/ $(UPDATE-RC.D) autofs defaults 75 25 - $(REMOVE)/$(AUTOFS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -SAMBA_TARGET = $(if $(filter $(BOXSERIES),hd1),samba33, samba36) - -samba: $(SAMBA_TARGET) +samba: $(if $(filter $(BOXSERIES),hd1),samba33,samba36) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1267,67 +1281,66 @@ SAMBA33_SITE = https://download.samba.org/pub/samba $(DL_DIR)/$(SAMBA33_SOURCE): $(DOWNLOAD) $(SAMBA33_SITE)/$(SAMBA33_SOURCE) -SAMBA33_PATCH = samba33-build-only-what-we-need.patch -SAMBA33_PATCH += samba33-configure.in-make-getgrouplist_ok-test-cross-compile.patch +SAMBA33_DEPS = zlib -SAMBA33_DEPS = zlib +SAMBA33_CONF_ENV = \ + CONFIG_SITE=$(PKG_FILES_DIR)/samba33-config.site + +SAMBA33_CONF_OPTS = \ + --datadir=/var/samba \ + --datarootdir=$(REMOVE_datarootdir) \ + --localstatedir=/var/samba \ + --sysconfdir=/etc/samba \ + --with-configdir=/etc/samba \ + --with-privatedir=/etc/samba \ + --with-modulesdir=$(REMOVE_libdir)/samba \ + --with-sys-quotas=no \ + --with-piddir=/var/run \ + --enable-static \ + --disable-shared \ + --without-cifsmount \ + --without-acl-support \ + --without-ads \ + --without-cluster-support \ + --without-dnsupdate \ + --without-krb5 \ + --without-ldap \ + --without-libnetapi \ + --without-libtalloc \ + --without-libtdb \ + --without-libsmbsharemodes \ + --without-libsmbclient \ + --without-libaddns \ + --without-pam \ + --without-winbind \ + --disable-shared-libs \ + --disable-avahi \ + --disable-cups \ + --disable-iprint \ + --disable-pie \ + --disable-relro \ + --disable-swat samba33: $(SAMBA33_DEPS) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SAMBA33_DIR) - $(UNTAR)/$(SAMBA33_SOURCE) - $(CHDIR)/$(SAMBA33_DIR); \ - $(call apply_patches,$(SAMBA33_PATCH)); \ - $(CHDIR)/$(SAMBA33_DIR)/source; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CHDIR)/$(PKG_DIR)/source; \ ./autogen.sh; \ - export CONFIG_SITE=$(CONFIGS)/samba33-config.site; \ - $(CONFIGURE) \ - --prefix=$(prefix)/ \ - --datadir=/var/samba \ - --datarootdir=$(REMOVE_datarootdir) \ - --localstatedir=/var/samba \ - --sysconfdir=/etc/samba \ - --with-configdir=/etc/samba \ - --with-privatedir=/etc/samba \ - --with-modulesdir=$(REMOVE_libdir)/samba \ - --with-sys-quotas=no \ - --with-piddir=/var/run \ - --enable-static \ - --disable-shared \ - --without-cifsmount \ - --without-acl-support \ - --without-ads \ - --without-cluster-support \ - --without-dnsupdate \ - --without-krb5 \ - --without-ldap \ - --without-libnetapi \ - --without-libtalloc \ - --without-libtdb \ - --without-libsmbsharemodes \ - --without-libsmbclient \ - --without-libaddns \ - --without-pam \ - --without-winbind \ - --disable-shared-libs \ - --disable-avahi \ - --disable-cups \ - --disable-iprint \ - --disable-pie \ - --disable-relro \ - --disable-swat \ - ; \ + $(CONFIGURE); \ $(MAKE1) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) mkdir -p $(TARGET_localstatedir)/samba/locks - $(INSTALL_DATA) $(TARGET_FILES)/configs/smb3.conf $(TARGET_sysconfdir)/samba/smb.conf - $(INSTALL_EXEC) $(TARGET_FILES)/scripts/samba3.init $(TARGET_sysconfdir)/init.d/samba + $(INSTALL_DATA) -D $(TARGET_FILES)/configs/smb3.conf $(TARGET_sysconfdir)/samba/smb.conf + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/samba3.init $(TARGET_sysconfdir)/init.d/samba $(UPDATE-RC.D) samba defaults 75 25 rm -rf $(TARGET_bindir)/testparm rm -rf $(TARGET_bindir)/findsmb rm -rf $(TARGET_bindir)/smbtar rm -rf $(TARGET_bindir)/smbclient rm -rf $(TARGET_bindir)/smbpasswd - $(REMOVE)/$(SAMBA33_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1340,75 +1353,64 @@ SAMBA36_SITE = https://download.samba.org/pub/samba/stable $(DL_DIR)/$(SAMBA36_SOURCE): $(DOWNLOAD) $(SAMBA36_SITE)/$(SAMBA36_SOURCE) -SAMBA36_PATCH1 = samba36-build-only-what-we-need.patch -SAMBA36_PATCH1 += samba36-remove_printer_support.patch -SAMBA36_PATCH1 += samba36-remove_ad_support.patch -SAMBA36_PATCH1 += samba36-remove_services.patch -SAMBA36_PATCH1 += samba36-remove_winreg_support.patch -SAMBA36_PATCH1 += samba36-remove_registry_backend.patch -SAMBA36_PATCH1 += samba36-strip_srvsvc.patch +SAMBA36_DEPS = zlib -SAMBA36_PATCH0 = samba36-CVE-2016-2112-v3-6.patch -SAMBA36_PATCH0 += samba36-CVE-2016-2115-v3-6.patch -SAMBA36_PATCH0 += samba36-CVE-2017-7494-v3-6.patch +SAMBA36_CONF_ENV = \ + CONFIG_SITE=$(PKG_FILES_DIR)/samba36-config.site -SAMBA36_DEPS = zlib +SAMBA36_CONF_OPTS = \ + --datadir=/var/samba \ + --datarootdir=$(REMOVE_datarootdir) \ + --localstatedir=/var/samba \ + --sysconfdir=/etc/samba \ + --with-configdir=/etc/samba \ + --with-privatedir=/etc/samba \ + --with-modulesdir=$(REMOVE_libdir)/samba \ + --with-piddir=/var/run \ + --with-sys-quotas=no \ + --enable-static \ + --disable-shared \ + --without-acl-support \ + --without-ads \ + --without-cluster-support \ + --without-dmapi \ + --without-dnsupdate \ + --without-krb5 \ + --without-ldap \ + --without-libnetapi \ + --without-libsmbsharemodes \ + --without-libsmbclient \ + --without-libaddns \ + --without-pam \ + --without-winbind \ + --disable-shared-libs \ + --disable-avahi \ + --disable-cups \ + --disable-iprint \ + --disable-pie \ + --disable-relro \ + --disable-swat \ samba36: $(SAMBA36_DEPS) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SAMBA36_DIR) - $(UNTAR)/$(SAMBA36_SOURCE) - $(CHDIR)/$(SAMBA36_DIR); \ - $(call apply_patches,$(SAMBA36_PATCH1),1); \ - $(call apply_patches,$(SAMBA36_PATCH0),0); \ - $(CHDIR)/$(SAMBA36_DIR)/source3; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CHDIR)/$(PKG_DIR)/source3; \ ./autogen.sh; \ - export CONFIG_SITE=$(CONFIGS)/samba36-config.site; \ - $(CONFIGURE) \ - --prefix=$(prefix)/ \ - --datadir=/var/samba \ - --datarootdir=$(REMOVE_datarootdir) \ - --localstatedir=/var/samba \ - --sysconfdir=/etc/samba \ - --with-configdir=/etc/samba \ - --with-privatedir=/etc/samba \ - --with-modulesdir=$(REMOVE_libdir)/samba \ - --with-piddir=/var/run \ - --with-sys-quotas=no \ - --enable-static \ - --disable-shared \ - --without-acl-support \ - --without-ads \ - --without-cluster-support \ - --without-dmapi \ - --without-dnsupdate \ - --without-krb5 \ - --without-ldap \ - --without-libnetapi \ - --without-libsmbsharemodes \ - --without-libsmbclient \ - --without-libaddns \ - --without-pam \ - --without-winbind \ - --disable-shared-libs \ - --disable-avahi \ - --disable-cups \ - --disable-iprint \ - --disable-pie \ - --disable-relro \ - --disable-swat \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) mkdir -p $(TARGET_localstatedir)/samba/locks - $(INSTALL_DATA) $(TARGET_FILES)/configs/smb3.conf $(TARGET_sysconfdir)/samba/smb.conf - $(INSTALL_EXEC) $(TARGET_FILES)/scripts/samba3.init $(TARGET_sysconfdir)/init.d/samba + $(INSTALL_DATA) -D $(TARGET_FILES)/configs/smb3.conf $(TARGET_sysconfdir)/samba/smb.conf + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/samba3.init $(TARGET_sysconfdir)/init.d/samba $(UPDATE-RC.D) samba defaults 75 25 rm -rf $(TARGET_bindir)/testparm rm -rf $(TARGET_bindir)/findsmb rm -rf $(TARGET_bindir)/smbtar rm -rf $(TARGET_bindir)/smbclient rm -rf $(TARGET_bindir)/smbpasswd - $(REMOVE)/$(SAMBA36_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1421,24 +1423,26 @@ DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases $(DL_DIR)/$(DROPBEAR_SOURCE): $(DOWNLOAD) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE) -DROPBEAR_DEPS = zlib +DROPBEAR_DEPS = zlib + +DROPBEAR_CONF_OPTS = \ + --disable-lastlog \ + --disable-pututxline \ + --disable-wtmp \ + --disable-wtmpx \ + --disable-loginfunc \ + --disable-pam \ + --disable-harden \ + --enable-bundled-libtom + +DROPBEAR_MAKE_OPTS = \ + PROGRAMS="dropbear dbclient dropbearkey scp" dropbear: $(DROPBEAR_DEPS) $(DL_DIR)/$(DROPBEAR_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(DROPBEAR_DIR) - $(UNTAR)/$(DROPBEAR_SOURCE) - $(CHDIR)/$(DROPBEAR_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --disable-lastlog \ - --disable-pututxline \ - --disable-wtmp \ - --disable-wtmpx \ - --disable-loginfunc \ - --disable-pam \ - --disable-harden \ - --enable-bundled-libtom \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ # Ensure that dropbear doesn't use crypt() when it's not available; \ echo '#if !HAVE_CRYPT' >> localoptions.h; \ echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> localoptions.h; \ @@ -1446,13 +1450,13 @@ dropbear: $(DROPBEAR_DEPS) $(DL_DIR)/$(DROPBEAR_SOURCE) | $(TARGET_DIR) # disable SMALL_CODE define; \ echo '#define DROPBEAR_SMALL_CODE 0' >> localoptions.h; \ # fix PATH define; \ - echo '#define DEFAULT_PATH "/usr/sbin:/usr/bin:/var/bin"' >> localoptions.h; \ - $(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" SCPPROGRESS=1; \ - $(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" install DESTDIR=$(TARGET_DIR) + echo '#define DEFAULT_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/var/bin"' >> localoptions.h; \ + $(MAKE) $($(PKG)_MAKE_OPTS) SCPPROGRESS=1; \ + $(MAKE) $($(PKG)_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) mkdir -p $(TARGET_sysconfdir)/dropbear $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/dropbear.init $(TARGET_sysconfdir)/init.d/dropbear $(UPDATE-RC.D) dropbear defaults 75 25 - $(REMOVE)/$(DROPBEAR_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1465,28 +1469,27 @@ SG3_UTILS_SITE = http://sg.danny.cz/sg/p $(DL_DIR)/$(SG3_UTILS_SOURCE): $(DOWNLOAD) $(SG3_UTILS_SITE)/$(SG3_UTILS_SOURCE) -SG3_UTILS_BIN = sg_start +SG3_UTILS_CONF_OPTS = \ + --bindir=$(bindir).$(@F) + +SG3_UTILS_BINARIES = sg_start sg3_utils: $(DL_DIR)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SG3_UTILS_DIR) - $(UNTAR)/$(SG3_UTILS_SOURCE) - $(CHDIR)/$(SG3_UTILS_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --bindir=/bin.$(@F) \ - --mandir=$(REMOVE_mandir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - for bin in $(SG3_UTILS_BIN); do \ + for bin in $($(PKG)_BINARIES); do \ rm -f $(TARGET_bindir)/$$bin; \ - $(INSTALL_EXEC) -D $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_bindir)/$$bin; \ + $(INSTALL_EXEC) -D $(TARGET_bindir).$(@F)/$$bin $(TARGET_bindir)/$$bin; \ done - $(REWRITE_LIBTOOL_LA) + rm -r $(TARGET_bindir).$(@F) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sdX.init $(TARGET_sysconfdir)/init.d/sdX $(UPDATE-RC.D) sdX stop 97 0 6 . - $(REMOVE)/$(SG3_UTILS_DIR) \ - $(TARGET_DIR)/bin.$(@F) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1499,21 +1502,18 @@ FBSHOT_SITE = http://distro.ibiblio.org/amigolinux/download/Utils/fbshot $(DL_DIR)/$(FBSHOT_SOURCE): $(DOWNLOAD) $(FBSHOT_SITE)/$(FBSHOT_SOURCE) -FBSHOT_PATCH = fbshot-32bit_cs_fb.diff -FBSHOT_PATCH += fbshot_cs_hd2.diff - -FBSHOT_DEPS = libpng +FBSHOT_DEPS = libpng fbshot: $(FBSHOT_DEPS) $(DL_DIR)/$(FBSHOT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FBSHOT_DIR) - $(UNTAR)/$(FBSHOT_SOURCE) - $(CHDIR)/$(FBSHOT_DIR); \ - $(call apply_patches,$(FBSHOT_PATCH)); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ $(SED) 's| gcc | $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) |' Makefile; \ $(SED) '/strip fbshot/d' Makefile; \ $(MAKE); \ $(INSTALL_EXEC) -D fbshot $(TARGET_bindir)/fbshot - $(REMOVE)/$(FBSHOT_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1523,32 +1523,30 @@ LCD4LINUX_DIR = lcd4linux.$(LCD4LINUX_VER) LCD4LINUX_SOURCE = lcd4linux.$(LCD4LINUX_VER) LCD4LINUX_SITE = https://github.com/TangoCash -LCD4LINUX_DEPS = ncurses libgd libdpf +LCD4LINUX_DEPS = ncurses libgd libdpf + +LCD4LINUX_CONF_OPTS = \ + --libdir=$(TARGET_libdir) \ + --includedir=$(TARGET_includedir) \ + --bindir=$(TARGET_bindir) \ + --docdir=$(REMOVE_docdir) \ + --with-ncurses=$(TARGET_libdir) \ + --with-drivers='DPF, SamsungSPF, PNG' \ + --with-plugins='all,!dbus,!mpris_dbus,!asterisk,!isdn,!pop3,!ppp,!seti,!huawei,!imon,!kvv,!sample,!w1retap,!wireless,!xmms,!gps,!mpd,!mysql,!qnaplog,!iconv' \ lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(LCD4LINUX_DIR) - $(GET-GIT-SOURCE) $(LCD4LINUX_SITE)/$(LCD4LINUX_SOURCE) $(DL_DIR)/$(LCD4LINUX_SOURCE) - $(CPDIR)/$(LCD4LINUX_SOURCE) - $(CHDIR)/$(LCD4LINUX_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ ./bootstrap; \ - $(CONFIGURE) \ - --libdir=$(TARGET_libdir) \ - --includedir=$(TARGET_includedir) \ - --bindir=$(TARGET_bindir) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --docdir=$(REMOVE_docdir) \ - --infodir=$(REMOVE_infodir) \ - --with-ncurses=$(TARGET_libdir) \ - --with-drivers='DPF, SamsungSPF, PNG' \ - --with-plugins='all,!dbus,!mpris_dbus,!asterisk,!isdn,!pop3,!ppp,!seti,!huawei,!imon,!kvv,!sample,!w1retap,!wireless,!xmms,!gps,!mpd,!mysql,!qnaplog,!iconv' \ - ; \ + $(CONFIGURE); \ $(MAKE) vcs_version; \ $(MAKE); \ $(MAKE) install $(INSTALL_COPY) $(TARGET_FILES)/lcd4linux/* $(TARGET_DIR)/ #$(MAKE) samsunglcd4linux - $(REMOVE)/$(LCD4LINUX_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1559,13 +1557,13 @@ SAMSUNGLCD4LINUX_SOURCE = samsunglcd4linux.$(LCD4LINUX_VER) SAMSUNGLCD4LINUX_SITE = https://github.com/horsti58 samsunglcd4linux: | $(TARGET_DIR) - $(REMOVE)/$(SAMSUNGLCD4LINUX_DIR) - $(GET-GIT-SOURCE) $(SAMSUNGLCD4LINUX_SITE)/$(SAMSUNGLCD4LINUX_SOURCE) $(DL_DIR)/$(SAMSUNGLCD4LINUX_SOURCE) - $(CPDIR)/$(SAMSUNGLCD4LINUX_SOURCE) - $(CHDIR)/$(SAMSUNGLCD4LINUX_DIR)/ni; \ + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR)/ni; \ $(INSTALL) -m 0600 etc/lcd4linux.conf $(TARGET_sysconfdir); \ $(INSTALL_COPY) share/* $(TARGET_datadir) - $(REMOVE)/$(SAMSUNGLCD4LINUX_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1581,16 +1579,16 @@ $(DL_DIR)/$(WPA_SUPPLICANT_SOURCE): WPA_SUPPLICANT_DEPS = openssl wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(DL_DIR)/$(WPA_SUPPLICANT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(WPA_SUPPLICANT_DIR) - $(UNTAR)/$(WPA_SUPPLICANT_SOURCE) - $(CHDIR)/$(WPA_SUPPLICANT_DIR)/wpa_supplicant; \ - $(INSTALL_DATA) $(CONFIGS)/wpa_supplicant.config .config; \ - $(MAKE_ENV) \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR)/wpa_supplicant; \ + $(INSTALL_DATA) $(PKG_FILES_DIR)/wpa_supplicant.config .config; \ + $(TARGET_CONFIGURE_ENV) \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=$(sbindir) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/pre-wlan0.sh $(TARGET_sysconfdir)/network/pre-wlan0.sh $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/post-wlan0.sh $(TARGET_sysconfdir)/network/post-wlan0.sh - $(REMOVE)/$(WPA_SUPPLICANT_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1600,79 +1598,73 @@ XUPNPD_DIR = xupnpd.$(XUPNPD_VER) XUPNPD_SOURCE = xupnpd.$(XUPNPD_VER) XUPNPD_SITE = https://github.com/clark15b -XUPNPD_PATCH = xupnpd-dynamic-lua.patch -XUPNPD_PATCH += xupnpd-fix-memleak.patch -XUPNPD_PATCH += xupnpd-fix-webif-backlinks.diff -XUPNPD_PATCH += xupnpd-add-configuration-files.diff +XUPNPD_CHECKOUT = 25d6d44 + +XUPNPD_DEPS = lua openssl -XUPNPD_DEPS = lua openssl +XUPNPD_MAKE_OPTS = \ + TARGET=$(TARGET) LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_includedir)" xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(XUPNPD_DIR) - $(GET-GIT-SOURCE) $(XUPNPD_SITE)/$(XUPNPD_SOURCE) $(DL_DIR)/$(XUPNPD_SOURCE) - $(CPDIR)/$(XUPNPD_SOURCE) - $(CHDIR)/$(XUPNPD_DIR); \ - git checkout 25d6d44; \ - $(call apply_patches,$(XUPNPD_PATCH)) - $(CHDIR)/$(XUPNPD_DIR)/src; \ - $(MAKE_ENV) \ - $(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET_CC) STRIP=$(TARGET_STRIP) LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_includedir)"; \ - $(INSTALL_EXEC) -D xupnpd $(TARGET_bindir)/; \ + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + git checkout $($(PKG)_CHECKOUT); \ + $(APPLY_PATCHES); \ + $(TARGET_CONFIGURE_ENV) \ + $(MAKE) -C src $($(PKG)_MAKE_OPTS) embedded ; \ + $(INSTALL_EXEC) -D src/xupnpd $(TARGET_bindir)/xupnpd; \ mkdir -p $(TARGET_datadir)/xupnpd/config; \ - $(INSTALL_COPY) plugins profiles ui www *.lua $(TARGET_datadir)/xupnpd/ + $(INSTALL_COPY) src/{plugins,profiles,ui,www,*.lua} $(TARGET_datadir)/xupnpd/ rm $(TARGET_datadir)/xupnpd/plugins/staff/xupnpd_18plus.lua - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_datadir)/xupnpd/plugins/ - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_datadir)/xupnpd/plugins/ - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_neutrino.lua $(TARGET_datadir)/xupnpd/plugins/ - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_vimeo.lua $(TARGET_datadir)/xupnpd/plugins/ - $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_datadir)/xupnpd/plugins/ + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_datadir)/xupnpd/plugins/ + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_datadir)/xupnpd/plugins/ + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_neutrino.lua $(TARGET_datadir)/xupnpd/plugins/ + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_vimeo.lua $(TARGET_datadir)/xupnpd/plugins/ + $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_datadir)/xupnpd/plugins/ $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/xupnpd.init $(TARGET_sysconfdir)/init.d/xupnpd $(UPDATE-RC.D) xupnpd defaults 75 25 $(INSTALL_COPY) $(TARGET_FILES)/xupnpd/* $(TARGET_DIR)/ - $(REMOVE)/$(XUPNPD_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -NFS-UTILS_VER = 2.2.1 -NFS-UTILS_DIR = nfs-utils-$(NFS-UTILS_VER) -NFS-UTILS_SOURCE = nfs-utils-$(NFS-UTILS_VER).tar.xz -NFS-UTILS_SITE = $(KERNEL_MIRROR)/linux/utils/nfs-utils/$(NFS-UTILS_VER) - -$(DL_DIR)/$(NFS-UTILS_SOURCE): - $(DOWNLOAD) $(NFS-UTILS_SITE)/$(NFS-UTILS_SOURCE) - -NFS-UTILS_PATCH = nfs-utils_01-Patch-taken-from-Gentoo.patch -NFS-UTILS_PATCH += nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch -NFS-UTILS_PATCH += nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-libt.patch -NFS-UTILS_PATCH += nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch - -NFS-UTILS_DEPS = rpcbind - -NFS-UTILS_CONF = $(if $(filter $(BOXSERIES),hd1),--disable-ipv6,--enable-ipv6) - -nfs-utils: $(NFS-UTILS_DEPS) $(DL_DIR)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(NFS-UTILS_DIR) - $(UNTAR)/$(NFS-UTILS_SOURCE) - $(CHDIR)/$(NFS-UTILS_DIR); \ - $(call apply_patches,$(NFS-UTILS_PATCH)); \ - export knfsd_cv_bsd_signals=no; \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --docdir=$(REMOVE_docdir) \ - --mandir=$(REMOVE_mandir) \ - --enable-maintainer-mode \ - --disable-nfsv4 \ - --disable-nfsv41 \ - --disable-gss \ - --disable-uuid \ - $(NFS-UTILS_CONF) \ - --without-tcp-wrappers \ - --with-statedir=/var/lib/nfs \ - --with-rpcgen=internal \ - --without-systemd \ - ; \ +NFS_UTILS_VER = 2.2.1 +NFS_UTILS_DIR = nfs-utils-$(NFS_UTILS_VER) +NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VER).tar.xz +NFS_UTILS_SITE = $(KERNEL_MIRROR)/linux/utils/nfs-utils/$(NFS_UTILS_VER) + +$(DL_DIR)/$(NFS_UTILS_SOURCE): + $(DOWNLOAD) $(NFS_UTILS_SITE)/$(NFS_UTILS_SOURCE) + +NFS_UTILS_DEPS = rpcbind + +NFS_UTILS_AUTORECONF = YES + +NFS_UTILS_CONF_ENV = \ + knfsd_cv_bsd_signals=no + +NFS_UTILS_CONF_OPTS = \ + --docdir=$(REMOVE_docdir) \ + --enable-maintainer-mode \ + $(if $(filter $(BOXSERIES),hd1),--disable-ipv6,--enable-ipv6) \ + --disable-nfsv4 \ + --disable-nfsv41 \ + --disable-gss \ + --disable-uuid \ + --without-tcp-wrappers \ + --with-statedir=/var/lib/nfs \ + --with-rpcgen=internal \ + --without-systemd + +nfs-utils: $(NFS_UTILS_DEPS) $(DL_DIR)/$(NFS_UTILS_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) chmod 0755 $(TARGET_base_sbindir)/mount.nfs @@ -1680,7 +1672,7 @@ nfs-utils: $(NFS-UTILS_DEPS) $(DL_DIR)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR) rm -f $(addprefix $(TARGET_sbindir)/,mountstats nfsiostat) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/nfsd.init $(TARGET_sysconfdir)/init.d/nfsd $(UPDATE-RC.D) nfsd defaults 75 25 - $(REMOVE)/$(NFS-UTILS_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1693,49 +1685,52 @@ RPCBIND_SITE = https://sourceforge.net/projects/rpcbind/files/rpcbind/$(RPCBIN $(DL_DIR)/$(RPCBIND_SOURCE): $(DOWNLOAD) $(RPCBIND_SITE)/$(RPCBIND_SOURCE) -RPCBIND_PATCH = rpcbind-0001-Remove-yellow-pages-support.patch -RPCBIND_PATCH += rpcbind-0002-add_option_to_fix_port_number.patch +RPCBIND_DEPS = libtirpc -RPCBIND_DEPS = libtirpc +RPCBIND_AUTORECONF = YES + +RPCBIND_CONF_OPTS = \ + --enable-silent-rules \ + --with-rpcuser=root \ + --with-systemdsystemunitdir=no rpcbind: $(RPCBIND_DEPS) $(DL_DIR)/$(RPCBIND_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(RPCBIND_DIR) - $(UNTAR)/$(RPCBIND_SOURCE) - $(CHDIR)/$(RPCBIND_DIR); \ - $(call apply_patches,$(RPCBIND_PATCH)); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-silent-rules \ - --with-rpcuser=root \ - --with-systemdsystemunitdir=no \ - --mandir=$(REMOVE_mandir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_bindir)/rpcgen - $(REMOVE)/$(RPCBIND_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -STREAMRIPPER_DEPS = libvorbisidec libmad glib2 +STREAMRIPPER_DEPS = libvorbisidec libmad glib2 + +STREAMRIPPER_AUTORECONF = yes + +STREAMRIPPER_CONF_OPTS = \ + --includedir=$(TARGET_includedir) \ + --datarootdir=$(REMOVE_datarootdir) \ + --with-ogg-includes=$(TARGET_includedir) \ + --with-ogg-libraries=$(TARGET_libdir) \ + --with-vorbis-includes=$(TARGET_includedir) \ + --with-vorbis-libraries=$(TARGET_libdir) \ + --with-included-argv=yes \ + --with-included-libmad=no streamripper: $(STREAMRIPPER_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(NI-STREAMRIPPER) - tar -C $(SOURCE_DIR) -cp $(NI-STREAMRIPPER) --exclude-vcs | tar -C $(BUILD_DIR) -x - $(CHDIR)/$(NI-STREAMRIPPER); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix= \ - --includedir=$(TARGET_includedir) \ - --datarootdir=$(REMOVE_datarootdir) \ - --with-included-argv=yes \ - --with-included-libmad=no \ - ; \ + $(REMOVE)/$(NI_STREAMRIPPER) + tar -C $(SOURCE_DIR) -cp $(NI_STREAMRIPPER) --exclude-vcs | tar -C $(BUILD_DIR) -x + $(CHDIR)/$(NI_STREAMRIPPER); \ + $(CONFIGURE); \ $(MAKE); \ $(INSTALL_EXEC) -D streamripper $(TARGET_bindir)/streamripper $(INSTALL_EXEC) $(TARGET_FILES)/scripts/streamripper.sh $(TARGET_bindir)/ + $(REMOVE)/$(NI_STREAMRIPPER) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1748,28 +1743,29 @@ GETTEXT_SITE = $(GNU_MIRROR)/gettext $(DL_DIR)/$(GETTEXT_SOURCE): $(DOWNLOAD) $(GETTEXT_SITE)/$(GETTEXT_SOURCE) +GETTEXT_AUTORECONF = YES + +GETTEXT_CONF_OPTS = \ + --bindir=$(REMOVE_bindir) \ + --datarootdir=$(REMOVE_datarootdir) \ + --disable-libasprintf \ + --disable-acl \ + --disable-openmp \ + --disable-java \ + --disable-native-java \ + --disable-csharp \ + --disable-relocatable \ + --without-emacs + gettext: $(DL_DIR)/$(GETTEXT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(GETTEXT_DIR) - $(UNTAR)/$(GETTEXT_SOURCE) - $(CHDIR)/$(GETTEXT_DIR)/gettext-runtime; \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --bindir=$(REMOVE_bindir) \ - --datarootdir=$(REMOVE_datarootdir) \ - --disable-libasprintf \ - --disable-acl \ - --disable-openmp \ - --disable-java \ - --disable-native-java \ - --disable-csharp \ - --disable-relocatable \ - --without-emacs \ - ; \ - $(MAKE); \ - $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(GETTEXT_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ + $(MAKE) -C gettext-runtime; \ + $(MAKE) -C gettext-runtime install DESTDIR=$(TARGET_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1782,37 +1778,36 @@ MC_SITE = ftp.midnight-commander.org $(DL_DIR)/$(MC_SOURCE): $(DOWNLOAD) $(MC_SITE)/$(MC_SOURCE) -MC_DEPS = glib2 ncurses +MC_DEPS = glib2 ncurses + +MC_AUTORECONF = YES + +MC_CONF_OPTS = \ + --enable-maintainer-mode \ + --enable-silent-rules \ + \ + --disable-charset \ + --disable-nls \ + --disable-vfs-extfs \ + --disable-vfs-fish \ + --disable-vfs-sfs \ + --disable-vfs-sftp \ + --with-screen=ncurses \ + --without-diff-viewer \ + --without-gpm-mouse \ + --without-x mc: $(MC_DEPS) $(DL_DIR)/$(MC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(MC_DIR) - $(UNTAR)/$(MC_SOURCE) - $(CHDIR)/$(MC_DIR); \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --sysconfdir=$(sysconfdir) \ - --mandir=$(REMOVE_mandir) \ - --enable-maintainer-mode \ - --enable-silent-rules \ - \ - --disable-charset \ - --disable-nls \ - --disable-vfs-extfs \ - --disable-vfs-fish \ - --disable-vfs-sfs \ - --disable-vfs-sftp \ - --with-screen=ncurses \ - --without-diff-viewer \ - --without-gpm-mouse \ - --without-x \ - ; \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_datadir)/mc/examples find $(TARGET_datadir)/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm - $(REMOVE)/$(MC_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1825,72 +1820,65 @@ WGET_SITE = $(GNU_MIRROR)/wget $(DL_DIR)/$(WGET_SOURCE): $(DOWNLOAD) $(WGET_SITE)/$(WGET_SOURCE) -WGET_PATCH = set-check_cert-false-by-default.patch -WGET_PATCH += change_DEFAULT_LOGFILE.patch - -WGET_DEPS = openssl +WGET_DEPS = openssl -WGET_CFLAGS = $(TARGET_CFLAGS) -DOPENSSL_NO_ENGINE +WGET_CONF_OPTS = \ + --datarootdir=$(REMOVE_datarootdir) \ + --sysconfdir=$(REMOVE_sysconfdir) \ + --with-gnu-ld \ + --with-ssl=openssl \ + --disable-debug \ + CFLAGS="$(TARGET_CFLAGS) -DOPENSSL_NO_ENGINE" wget: $(WGET_DEPS) $(DL_DIR)/$(WGET_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(WGET_DIR) - $(UNTAR)/$(WGET_SOURCE) - $(CHDIR)/$(WGET_DIR); \ - $(call apply_patches,$(addprefix $(@F)/,$(WGET_PATCH))); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --datarootdir=$(REMOVE_datarootdir) \ - --sysconfdir=$(REMOVE_sysconfdir) \ - --with-gnu-ld \ - --with-ssl=openssl \ - --disable-debug \ - CFLAGS="$(WGET_CFLAGS)" \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(WGET_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR) - $(REMOVE)/$(NI-OFGWRITE) - tar -C $(SOURCE_DIR) -cp $(NI-OFGWRITE) --exclude-vcs | tar -C $(BUILD_DIR) -x - $(CHDIR)/$(NI-OFGWRITE); \ - $(MAKE_ENV) \ +ofgwrite: $(SOURCE_DIR)/$(NI_OFGWRITE) | $(TARGET_DIR) + $(REMOVE)/$(NI_OFGWRITE) + tar -C $(SOURCE_DIR) -cp $(NI_OFGWRITE) --exclude-vcs | tar -C $(BUILD_DIR) -x + $(CHDIR)/$(NI_OFGWRITE); \ + $(TARGET_CONFIGURE_ENV) \ $(MAKE) - $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_bindir) - $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_bindir) - $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite $(TARGET_bindir) + $(INSTALL_EXEC) $(BUILD_DIR)/$(NI_OFGWRITE)/ofgwrite_bin $(TARGET_bindir) + $(INSTALL_EXEC) $(BUILD_DIR)/$(NI_OFGWRITE)/ofgwrite_caller $(TARGET_bindir) + $(INSTALL_EXEC) $(BUILD_DIR)/$(NI_OFGWRITE)/ofgwrite $(TARGET_bindir) $(SED) 's|prefix=.*|prefix=$(prefix)|' $(TARGET_bindir)/ofgwrite - $(REMOVE)/$(NI-OFGWRITE) + $(REMOVE)/$(NI_OFGWRITE) $(TOUCH) # ----------------------------------------------------------------------------- -AIO-GRAB_VER = git -AIO-GRAB_DIR = aio-grab.$(AIO-GRAB_VER) -AIO-GRAB_SOURCE = aio-grab.$(AIO-GRAB_VER) -AIO-GRAB_SITE = https://github.com/oe-alliance - -AIO-GRAB_DEPS = zlib libpng libjpeg-turbo - -aio-grab: $(AIO-GRAB_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(AIO-GRAB_DIR) - $(GET-GIT-SOURCE) $(AIO-GRAB_SITE)/$(AIO-GRAB_SOURCE) $(DL_DIR)/$(AIO-GRAB_SOURCE) - $(CPDIR)/$(AIO-GRAB_SOURCE) - $(CHDIR)/$(AIO-GRAB_DIR); \ - aclocal --force -I m4; \ - libtoolize --copy --ltdl --force; \ - autoconf --force; \ - automake --add-missing --copy --force-missing --foreign; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-silent-rules \ - ; \ +AIO_GRAB_VER = git +AIO_GRAB_DIR = aio-grab.$(AIO_GRAB_VER) +AIO_GRAB_SOURCE = aio-grab.$(AIO_GRAB_VER) +AIO_GRAB_SITE = https://github.com/oe-alliance + +AIO_GRAB_DEPS = zlib libpng libjpeg-turbo + +AIO_GRAB_AUTORECONF = YES + +AIO_GRAB_CONF_OPTS = \ + --enable-silent-rules + +aio-grab: $(AIO_GRAB_DEPS) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(AIO-GRAB_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1900,45 +1888,44 @@ DVBSNOOP_DIR = dvbsnoop.$(DVBSNOOP_VER) DVBSNOOP_SOURCE = dvbsnoop.$(DVBSNOOP_VER) DVBSNOOP_SITE = https://github.com/Duckbox-Developers +DVBSNOOP_CONF-OPTS = \ + --enable-silent-rules + dvbsnoop: | $(TARGET_DIR) - $(REMOVE)/$(DVBSNOOP_DIR) - $(GET-GIT-SOURCE) $(DVBSNOOP_SITE)/$(DVBSNOOP_SOURCE) $(DL_DIR)/$(DVBSNOOP_SOURCE) - $(CPDIR)/$(DVBSNOOP_SOURCE) - $(CHDIR)/$(DVBSNOOP_DIR); \ - $(CONFIGURE) \ - --enable-silent-rules \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(DVBSNOOP_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -DVB-APPS_VER = git -DVB-APPS_DIR = dvb-apps.$(DVB-APPS_VER) -DVB-APPS_SOURCE = dvb-apps.$(DVB-APPS_VER) -DVB-APPS_SITE = https://github.com/openpli-arm +DVB_APPS_VER = git +DVB_APPS_DIR = dvb-apps.$(DVB_APPS_VER) +DVB_APPS_SOURCE = dvb-apps.$(DVB_APPS_VER) +DVB_APPS_SITE = https://github.com/openpli-arm -DVB-APPS_DEPS = kernel libiconv +DVB_APPS_DEPS = kernel libiconv -DVB-APPS_MAKE_OPTS = \ +DVB_APPS_MAKE_OPTS = \ KERNEL_HEADERS=$(BUILD_DIR)/$(KERNEL_HEADERS) \ enable_shared=no \ PERL5LIB=$(PKG_BUILD_DIR)/util/scan \ -dvb-apps: $(DVB-APPS_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(DVB-APPS_DIR) - $(GET-GIT-SOURCE) $(DVB-APPS_SITE)/$(DVB-APPS_SOURCE) $(DL_DIR)/$(DVB-APPS_SOURCE) - $(CPDIR)/$(DVB-APPS_SOURCE) - $(CHDIR)/$(DVB-APPS_DIR); \ +dvb-apps: $(DVB_APPS_DEPS) | $(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ - $(MAKE_ENV) LDLIBS="-liconv" \ - $(MAKE) $(DVB-APPS_MAKE_OPTS); \ - $(MAKE) $(DVB-APPS_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(DVB-APPS_DIR) + $(TARGET_CONFIGURE_ENV) LDLIBS="-liconv" \ + $(MAKE) $($(PKG)_MAKE_OPTS); \ + $(MAKE) $($(PKG)_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1948,20 +1935,20 @@ MINISATIP_DIR = minisatip.$(MINISATIP_VER) MINISATIP_SOURCE = minisatip.$(MINISATIP_VER) MINISATIP_SITE = https://github.com/catalinii -MINISATIP_DEPS = libdvbcsa openssl dvb-apps +MINISATIP_DEPS = libdvbcsa openssl dvb-apps + +MINISATIP_CONF_OPTS = \ + --enable-static \ + --enable-enigma \ + --disable-netcv minisatip: $(MINISATIP_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(MINISATIP_DIR) - $(GET-GIT-SOURCE) $(MINISATIP_SITE)/$(MINISATIP_SOURCE) $(DL_DIR)/$(MINISATIP_SOURCE) - $(CPDIR)/$(MINISATIP_SOURCE) - $(CHDIR)/$(MINISATIP_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --enable-static \ - --enable-enigma \ - --disable-netcv \ - ; \ - $(MAKE_ENV) \ + $(REMOVE)/$(PKG_DIR) + $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(CPDIR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ + $(TARGET_CONFIGURE_ENV) \ $(MAKE) $(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/minisatip $(TARGET_bindir)/minisatip $(INSTALL) -d $(TARGET_datadir)/minisatip @@ -1970,7 +1957,7 @@ minisatip: $(MINISATIP_DEPS) | $(TARGET_DIR) echo 'MINISATIP_OPTS="-x 9090 -t -o /tmp/camd.socket"' > $(TARGET_sysconfdir)/default/minisatip $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/minisatip.init $(TARGET_sysconfdir)/init.d/minisatip $(UPDATE-RC.D) minisatip defaults 75 25 - $(REMOVE)/$(MINISATIP_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1983,20 +1970,19 @@ ETHTOOL_SITE = $(KERNEL_MIRROR)/software/network/ethtool $(DL_DIR)/$(ETHTOOL_SOURCE): $(DOWNLOAD) $(ETHTOOL_SITE)/$(ETHTOOL_SOURCE) +ETHTOOL_CONF_OPTS = \ + --libdir=$(TARGET_libdir) \ + --disable-pretty-dump \ + --disable-netlink + ethtool: $(DL_DIR)/$(ETHTOOL_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(ETHTOOL_DIR) - $(UNTAR)/$(ETHTOOL_SOURCE) - $(CHDIR)/$(ETHTOOL_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --libdir=$(TARGET_libdir) \ - --disable-pretty-dump \ - --disable-netlink \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(ETHTOOL_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -2009,21 +1995,21 @@ GPTFDISK_SITE = https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPT $(DL_DIR)/$(GPTFDISK_SOURCE): $(DOWNLOAD) $(GPTFDISK_SITE)/$(GPTFDISK_SOURCE) -GPTFDISK_PATCH = gptfdisk-ldlibs.patch +GPTFDISK_DEPS = popt e2fsprogs ncurses -GPTFDISK_DEPS = popt e2fsprogs +GPTFDISK_SBINARIES = sgdisk gptfdisk: $(GPTFDISK_DEPS) $(DL_DIR)/$(GPTFDISK_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(GPTFDISK_DIR) - $(UNTAR)/$(GPTFDISK_SOURCE) - $(CHDIR)/$(GPTFDISK_DIR); \ - $(call apply_patches,$(GPTFDISK_PATCH)); \ - $(SED) 's|^CC=.*|CC=$(TARGET_CC)|' Makefile; \ - $(SED) 's|^CXX=.*|CXX=$(TARGET_CXX)|' Makefile; \ - $(MAKE_ENV) \ - $(MAKE) sgdisk; \ - $(INSTALL_EXEC) -D sgdisk $(TARGET_sbindir)/sgdisk - $(REMOVE)/$(GPTFDISK_DIR) + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ + $(TARGET_CONFIGURE_ENV) \ + $(MAKE) $($(PKG)_SBINARIES); \ + for sbin in $($(PKG)_SBINARIES); do \ + $(INSTALL_EXEC) -D $$sbin $(TARGET_sbindir)/$$sbin; \ + done + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -2036,24 +2022,23 @@ RSYNC_SITE = https://download.samba.org/pub/rsync/src/ $(DL_DIR)/$(RSYNC_SOURCE): $(DOWNLOAD) $(RSYNC_SITE)/$(RSYNC_SOURCE) -RSYNC_DEPS = zlib popt +RSYNC_DEPS = zlib popt + +RSYNC_CONF_OPTS = \ + --disable-debug \ + --disable-locale \ + --disable-acl-support \ + --with-included-zlib=no \ + --with-included-popt=no rsync: $(RSYNC_DEPS) $(DL_DIR)/$(RSYNC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(RSYNC_DIR) - $(UNTAR)/$(RSYNC_SOURCE) - $(CHDIR)/$(RSYNC_DIR); \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --mandir=$(REMOVE_mandir) \ - --disable-debug \ - --disable-locale \ - --disable-acl-support \ - --with-included-zlib=no \ - --with-included-popt=no \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(RSYNC_DIR) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -2066,42 +2051,43 @@ FLAC_SITE = http://downloads.xiph.org/releases/flac $(DL_DIR)/$(FLAC_SOURCE): $(DOWNLOAD) $(FLAC_SITE)/$(FLAC_SOURCE) +FLAC_AUTORECONF = YES + +FLAC_CONF_OPTS = \ + --bindir=$(REMOVE_bindir) \ + --datarootdir=$(REMOVE_datarootdir) \ + --enable-shared \ + --disable-static \ + --disable-cpplibs \ + --disable-xmms-plugin \ + --disable-altivec \ + --disable-ogg \ + --disable-sse + flac: $(DL_DIR)/$(FLAC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FLAC_DIR) - $(UNTAR)/$(FLAC_SOURCE) - $(CHDIR)/$(FLAC_DIR); \ - autoreconf -fi; \ - $(CONFIGURE) \ - --prefix=$(prefix) \ - --bindir=$(REMOVE_bindir) \ - --datarootdir=$(REMOVE_datarootdir) \ - --enable-shared \ - --disable-static \ - --disable-cpplibs \ - --disable-xmms-plugin \ - --disable-altivec \ - --disable-ogg \ - --disable-sse \ - ; \ + $(REMOVE)/$(PKG_DIR) + $(UNTAR)/$(PKG_SOURCE) + $(CHDIR)/$(PKG_DIR); \ + $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(FLAC_DIR) + $(REWRITE_LIBTOOL) + $(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- -CA-BUNDLE_SOURCE = cacert.pem -CA-BUNDLE_SITE = https://curl.se/ca +CA_BUNDLE_SOURCE = cacert.pem +CA_BUNDLE_SITE = https://curl.se/ca -$(DL_DIR)/$(CA-BUNDLE_SOURCE): - $(DOWNLOAD) $(CA-BUNDLE_SITE)/$(CA-BUNDLE_SOURCE) +$(DL_DIR)/$(CA_BUNDLE_SOURCE): + $(DOWNLOAD) $(CA_BUNDLE_SITE)/$(CA_BUNDLE_SOURCE) -CA-BUNDLE = ca-certificates.crt -CA-BUNDLE_DIR = /etc/ssl/certs +CA_BUNDLE_CRT = ca-certificates.crt +CA_BUNDLE_DIR = /etc/ssl/certs -ca-bundle: $(DL_DIR)/$(CA-BUNDLE_SOURCE) | $(TARGET_DIR) +ca-bundle: $(DL_DIR)/$(CA_BUNDLE_SOURCE) | $(TARGET_DIR) $(CD) $(DL_DIR); \ - curl --remote-name --remote-time -z $(CA-BUNDLE_SOURCE) $(CA-BUNDLE_SITE)/$(CA-BUNDLE_SOURCE) || true - $(INSTALL_DATA) -D $(DL_DIR)/$(CA-BUNDLE_SOURCE) $(TARGET_DIR)/$(CA-BUNDLE_DIR)/$(CA-BUNDLE) + curl --remote-name --remote-time -z $(PKG_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) || true + $(INSTALL_DATA) -D $(DL_DIR)/$(PKG_SOURCE) $(TARGET_DIR)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE_CRT) $(TOUCH) diff --git a/patches/alsa-lib/0000-alsa_pc_in.patch b/package/alsa-lib/patches/0000-alsa_pc_in.patch similarity index 100% rename from patches/alsa-lib/0000-alsa_pc_in.patch rename to package/alsa-lib/patches/0000-alsa_pc_in.patch diff --git a/patches/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch b/package/alsa-lib/patches/0001-Don-t-use-fork-on-noMMU-platforms.patch similarity index 100% rename from patches/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch rename to package/alsa-lib/patches/0001-Don-t-use-fork-on-noMMU-platforms.patch diff --git a/patches/autofs/force-STRIP-to-emtpy.patch b/package/autofs/patches/0000-force-STRIP-to-emtpy.patch similarity index 100% rename from patches/autofs/force-STRIP-to-emtpy.patch rename to package/autofs/patches/0000-force-STRIP-to-emtpy.patch diff --git a/patches/base-passwd/0000-align-root.patch b/package/base-passwd/patches/0000-align-root.patch similarity index 100% rename from patches/base-passwd/0000-align-root.patch rename to package/base-passwd/patches/0000-align-root.patch diff --git a/patches/base-passwd/0005-disable-docs.patch b/package/base-passwd/patches/0005-disable-docs.patch similarity index 100% rename from patches/base-passwd/0005-disable-docs.patch rename to package/base-passwd/patches/0005-disable-docs.patch diff --git a/patches/bash/bash50-001 b/package/bash/patches/bash50-001 similarity index 100% rename from patches/bash/bash50-001 rename to package/bash/patches/bash50-001 diff --git a/patches/bash/bash50-002 b/package/bash/patches/bash50-002 similarity index 100% rename from patches/bash/bash50-002 rename to package/bash/patches/bash50-002 diff --git a/patches/bash/bash50-003 b/package/bash/patches/bash50-003 similarity index 100% rename from patches/bash/bash50-003 rename to package/bash/patches/bash50-003 diff --git a/patches/bash/bash50-004 b/package/bash/patches/bash50-004 similarity index 100% rename from patches/bash/bash50-004 rename to package/bash/patches/bash50-004 diff --git a/patches/bash/bash50-005 b/package/bash/patches/bash50-005 similarity index 100% rename from patches/bash/bash50-005 rename to package/bash/patches/bash50-005 diff --git a/patches/bash/bash50-006 b/package/bash/patches/bash50-006 similarity index 100% rename from patches/bash/bash50-006 rename to package/bash/patches/bash50-006 diff --git a/patches/bash/bash50-007 b/package/bash/patches/bash50-007 similarity index 100% rename from patches/bash/bash50-007 rename to package/bash/patches/bash50-007 diff --git a/patches/bash/bash50-008 b/package/bash/patches/bash50-008 similarity index 100% rename from patches/bash/bash50-008 rename to package/bash/patches/bash50-008 diff --git a/patches/bash/bash50-009 b/package/bash/patches/bash50-009 similarity index 100% rename from patches/bash/bash50-009 rename to package/bash/patches/bash50-009 diff --git a/patches/bash/bash50-010 b/package/bash/patches/bash50-010 similarity index 100% rename from patches/bash/bash50-010 rename to package/bash/patches/bash50-010 diff --git a/patches/bash/bash50-011 b/package/bash/patches/bash50-011 similarity index 100% rename from patches/bash/bash50-011 rename to package/bash/patches/bash50-011 diff --git a/patches/bash/bash50-012 b/package/bash/patches/bash50-012 similarity index 100% rename from patches/bash/bash50-012 rename to package/bash/patches/bash50-012 diff --git a/patches/bash/bash50-013 b/package/bash/patches/bash50-013 similarity index 100% rename from patches/bash/bash50-013 rename to package/bash/patches/bash50-013 diff --git a/patches/bash/bash50-014 b/package/bash/patches/bash50-014 similarity index 100% rename from patches/bash/bash50-014 rename to package/bash/patches/bash50-014 diff --git a/patches/bash/bash50-015 b/package/bash/patches/bash50-015 similarity index 100% rename from patches/bash/bash50-015 rename to package/bash/patches/bash50-015 diff --git a/patches/bash/bash50-016 b/package/bash/patches/bash50-016 similarity index 100% rename from patches/bash/bash50-016 rename to package/bash/patches/bash50-016 diff --git a/patches/bash/bash50-017 b/package/bash/patches/bash50-017 similarity index 100% rename from patches/bash/bash50-017 rename to package/bash/patches/bash50-017 diff --git a/configs/busybox-minimal.config b/package/busybox/files/busybox-minimal.config similarity index 100% rename from configs/busybox-minimal.config rename to package/busybox/files/busybox-minimal.config diff --git a/patches/busybox-fix-config-header.diff b/package/busybox/patches/busybox-fix-config-header.diff similarity index 100% rename from patches/busybox-fix-config-header.diff rename to package/busybox/patches/busybox-fix-config-header.diff diff --git a/patches/busybox-fix-partition-size.patch b/package/busybox/patches/busybox-fix-partition-size.patch similarity index 100% rename from patches/busybox-fix-partition-size.patch rename to package/busybox/patches/busybox-fix-partition-size.patch diff --git a/patches/busybox-insmod-hack.patch b/package/busybox/patches/busybox-insmod-hack.patch similarity index 100% rename from patches/busybox-insmod-hack.patch rename to package/busybox/patches/busybox-insmod-hack.patch diff --git a/patches/busybox-mount_single_uuid.patch b/package/busybox/patches/busybox-mount_single_uuid.patch similarity index 100% rename from patches/busybox-mount_single_uuid.patch rename to package/busybox/patches/busybox-mount_single_uuid.patch diff --git a/patches/bzip2.patch b/package/bzip2/patches/bzip2.patch similarity index 100% rename from patches/bzip2.patch rename to package/bzip2/patches/bzip2.patch diff --git a/patches/cairo-get_bitmap_surface.diff b/package/cairo/patches/cairo-get_bitmap_surface.diff similarity index 100% rename from patches/cairo-get_bitmap_surface.diff rename to package/cairo/patches/cairo-get_bitmap_surface.diff diff --git a/patches/coreutils-fix-build.patch b/package/coreutils/patches/coreutils-fix-build.patch similarity index 100% rename from patches/coreutils-fix-build.patch rename to package/coreutils/patches/coreutils-fix-build.patch diff --git a/configs/ct-ng-armbox.config b/package/crosstool-ng/files/ct-ng-armbox.config similarity index 100% rename from configs/ct-ng-armbox.config rename to package/crosstool-ng/files/ct-ng-armbox.config diff --git a/configs/ct-ng-coolstream-hd1.config b/package/crosstool-ng/files/ct-ng-coolstream-hd1.config similarity index 100% rename from configs/ct-ng-coolstream-hd1.config rename to package/crosstool-ng/files/ct-ng-coolstream-hd1.config diff --git a/configs/ct-ng-coolstream-hd2.config b/package/crosstool-ng/files/ct-ng-coolstream-hd2.config similarity index 100% rename from configs/ct-ng-coolstream-hd2.config rename to package/crosstool-ng/files/ct-ng-coolstream-hd2.config diff --git a/configs/ct-ng-mipsbox.config b/package/crosstool-ng/files/ct-ng-mipsbox.config similarity index 100% rename from configs/ct-ng-mipsbox.config rename to package/crosstool-ng/files/ct-ng-mipsbox.config diff --git a/configs/ct-ng-uClibc-1.0.24.config b/package/crosstool-ng/files/ct-ng-uClibc-1.0.24.config similarity index 100% rename from configs/ct-ng-uClibc-1.0.24.config rename to package/crosstool-ng/files/ct-ng-uClibc-1.0.24.config diff --git a/patches/crosstool-ng-bash-version.patch b/package/crosstool-ng/patches/crosstool-ng-bash-version.patch similarity index 100% rename from patches/crosstool-ng-bash-version.patch rename to package/crosstool-ng/patches/crosstool-ng-bash-version.patch diff --git a/patches/crosstool-ng/gcc/999-gcc-6.3-backport-fix-of-check-for-empty-string-in-ubsan.c.patch b/package/crosstool-ng/patches/gcc/999-gcc-6.3-backport-fix-of-check-for-empty-string-in-ubsan.c.patch similarity index 100% rename from patches/crosstool-ng/gcc/999-gcc-6.3-backport-fix-of-check-for-empty-string-in-ubsan.c.patch rename to package/crosstool-ng/patches/gcc/999-gcc-6.3-backport-fix-of-check-for-empty-string-in-ubsan.c.patch diff --git a/patches/djmount-fix-hang-with-asset-upnp.patch b/package/djmount/patches/djmount-fix-hang-with-asset-upnp.patch similarity index 100% rename from patches/djmount-fix-hang-with-asset-upnp.patch rename to package/djmount/patches/djmount-fix-hang-with-asset-upnp.patch diff --git a/patches/djmount-fix-incorrect-range-when-retrieving-content-via-HTTP.patch b/package/djmount/patches/djmount-fix-incorrect-range-when-retrieving-content-via-HTTP.patch similarity index 100% rename from patches/djmount-fix-incorrect-range-when-retrieving-content-via-HTTP.patch rename to package/djmount/patches/djmount-fix-incorrect-range-when-retrieving-content-via-HTTP.patch diff --git a/patches/djmount-fix-new-autotools.diff b/package/djmount/patches/djmount-fix-new-autotools.diff similarity index 100% rename from patches/djmount-fix-new-autotools.diff rename to package/djmount/patches/djmount-fix-new-autotools.diff diff --git a/patches/djmount-fix-newer-gcc.patch b/package/djmount/patches/djmount-fix-newer-gcc.patch similarity index 100% rename from patches/djmount-fix-newer-gcc.patch rename to package/djmount/patches/djmount-fix-newer-gcc.patch diff --git a/patches/djmount-fixed-crash-when-using-UTF-8-charset.patch b/package/djmount/patches/djmount-fixed-crash-when-using-UTF-8-charset.patch similarity index 100% rename from patches/djmount-fixed-crash-when-using-UTF-8-charset.patch rename to package/djmount/patches/djmount-fixed-crash-when-using-UTF-8-charset.patch diff --git a/patches/djmount-fixed-crash.patch b/package/djmount/patches/djmount-fixed-crash.patch similarity index 100% rename from patches/djmount-fixed-crash.patch rename to package/djmount/patches/djmount-fixed-crash.patch diff --git a/patches/djmount-support-fstab-mounting.diff b/package/djmount/patches/djmount-support-fstab-mounting.diff similarity index 100% rename from patches/djmount-support-fstab-mounting.diff rename to package/djmount/patches/djmount-support-fstab-mounting.diff diff --git a/patches/djmount-support-seeking-in-large-2gb-files.patch b/package/djmount/patches/djmount-support-seeking-in-large-2gb-files.patch similarity index 100% rename from patches/djmount-support-seeking-in-large-2gb-files.patch rename to package/djmount/patches/djmount-support-seeking-in-large-2gb-files.patch diff --git a/patches/dosfstools/switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch b/package/dosfstools/patches/switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch similarity index 100% rename from patches/dosfstools/switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch rename to package/dosfstools/patches/switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch diff --git a/patches/dvb-apps/0001-Fix-generate-keynames.patch b/package/dvb-apps/patches/0001-Fix-generate-keynames.patch similarity index 100% rename from patches/dvb-apps/0001-Fix-generate-keynames.patch rename to package/dvb-apps/patches/0001-Fix-generate-keynames.patch diff --git a/patches/dvb-apps/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch b/package/dvb-apps/patches/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch similarity index 100% rename from patches/dvb-apps/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch rename to package/dvb-apps/patches/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch diff --git a/patches/dvb-apps/0003-handle-static-shared-only-build.patch b/package/dvb-apps/patches/0003-handle-static-shared-only-build.patch similarity index 100% rename from patches/dvb-apps/0003-handle-static-shared-only-build.patch rename to package/dvb-apps/patches/0003-handle-static-shared-only-build.patch diff --git a/patches/dvb-apps/0004-Makefile-remove-test.patch b/package/dvb-apps/patches/0004-Makefile-remove-test.patch similarity index 100% rename from patches/dvb-apps/0004-Makefile-remove-test.patch rename to package/dvb-apps/patches/0004-Makefile-remove-test.patch diff --git a/patches/dvb-apps/0005-libucsi-optimization-removal.patch b/package/dvb-apps/patches/0005-libucsi-optimization-removal.patch similarity index 100% rename from patches/dvb-apps/0005-libucsi-optimization-removal.patch rename to package/dvb-apps/patches/0005-libucsi-optimization-removal.patch diff --git a/patches/dvb-apps/0006-CA_SET_PID.patch b/package/dvb-apps/patches/0006-CA_SET_PID.patch similarity index 100% rename from patches/dvb-apps/0006-CA_SET_PID.patch rename to package/dvb-apps/patches/0006-CA_SET_PID.patch diff --git a/patches/expat-libtool-tag.patch b/package/expat/patches/expat-libtool-tag.patch similarity index 100% rename from patches/expat-libtool-tag.patch rename to package/expat/patches/expat-libtool-tag.patch diff --git a/patches/ext4_utils.mk b/package/ext4_utils/patches/ext4_utils.mk similarity index 100% rename from patches/ext4_utils.mk rename to package/ext4_utils/patches/ext4_utils.mk diff --git a/patches/fbshot-32bit_cs_fb.diff b/package/fbshot/patches/fbshot-32bit_cs_fb.diff similarity index 100% rename from patches/fbshot-32bit_cs_fb.diff rename to package/fbshot/patches/fbshot-32bit_cs_fb.diff diff --git a/patches/fbshot_cs_hd2.diff b/package/fbshot/patches/fbshot_cs_hd2.diff similarity index 100% rename from patches/fbshot_cs_hd2.diff rename to package/fbshot/patches/fbshot_cs_hd2.diff diff --git a/patches/ffmpeg/4_02_fix_mpegts.patch b/package/ffmpeg/patches/4_02_fix_mpegts.patch similarity index 100% rename from patches/ffmpeg/4_02_fix_mpegts.patch rename to package/ffmpeg/patches/4_02_fix_mpegts.patch diff --git a/patches/ffmpeg/4_03_allow_to_choose_rtmp_impl_at_runtime.patch b/package/ffmpeg/patches/4_03_allow_to_choose_rtmp_impl_at_runtime.patch similarity index 100% rename from patches/ffmpeg/4_03_allow_to_choose_rtmp_impl_at_runtime.patch rename to package/ffmpeg/patches/4_03_allow_to_choose_rtmp_impl_at_runtime.patch diff --git a/patches/ffmpeg/4_04_hls_replace_key_uri.patch b/package/ffmpeg/patches/4_04_hls_replace_key_uri.patch similarity index 100% rename from patches/ffmpeg/4_04_hls_replace_key_uri.patch rename to package/ffmpeg/patches/4_04_hls_replace_key_uri.patch diff --git a/patches/ffmpeg/4_06_optimize_aac.patch b/package/ffmpeg/patches/4_06_optimize_aac.patch similarity index 100% rename from patches/ffmpeg/4_06_optimize_aac.patch rename to package/ffmpeg/patches/4_06_optimize_aac.patch diff --git a/patches/ffmpeg/4_07_increase_buffer_size.patch b/package/ffmpeg/patches/4_07_increase_buffer_size.patch similarity index 100% rename from patches/ffmpeg/4_07_increase_buffer_size.patch rename to package/ffmpeg/patches/4_07_increase_buffer_size.patch diff --git a/patches/ffmpeg/4_08_recheck_discard_flags.patch b/package/ffmpeg/patches/4_08_recheck_discard_flags.patch similarity index 100% rename from patches/ffmpeg/4_08_recheck_discard_flags.patch rename to package/ffmpeg/patches/4_08_recheck_discard_flags.patch diff --git a/patches/ffmpeg/4_09_ffmpeg_fix_edit_list_parsing.patch b/package/ffmpeg/patches/4_09_ffmpeg_fix_edit_list_parsing.patch similarity index 100% rename from patches/ffmpeg/4_09_ffmpeg_fix_edit_list_parsing.patch rename to package/ffmpeg/patches/4_09_ffmpeg_fix_edit_list_parsing.patch diff --git a/patches/ffmpeg/4_10_rtsp_patch b/package/ffmpeg/patches/4_10_rtsp_patch similarity index 100% rename from patches/ffmpeg/4_10_rtsp_patch rename to package/ffmpeg/patches/4_10_rtsp_patch diff --git a/patches/ffmpeg/4_11_dxva2_patch b/package/ffmpeg/patches/4_11_dxva2_patch similarity index 100% rename from patches/ffmpeg/4_11_dxva2_patch rename to package/ffmpeg/patches/4_11_dxva2_patch diff --git a/patches/ffmpeg/4_A02-corrupt-h264-frames.patch b/package/ffmpeg/patches/4_A02-corrupt-h264-frames.patch similarity index 100% rename from patches/ffmpeg/4_A02-corrupt-h264-frames.patch rename to package/ffmpeg/patches/4_A02-corrupt-h264-frames.patch diff --git a/patches/ffmpeg/4_A11-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch b/package/ffmpeg/patches/4_A11-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch similarity index 100% rename from patches/ffmpeg/4_A11-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch rename to package/ffmpeg/patches/4_A11-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch diff --git a/patches/ffmpeg/4_mips64_cpu_detection.patch b/package/ffmpeg/patches/4_mips64_cpu_detection.patch similarity index 100% rename from patches/ffmpeg/4_mips64_cpu_detection.patch rename to package/ffmpeg/patches/4_mips64_cpu_detection.patch diff --git a/patches/freetype2-config.patch b/package/freetype2/patches/freetype2-config.patch similarity index 100% rename from patches/freetype2-config.patch rename to package/freetype2/patches/freetype2-config.patch diff --git a/patches/freetype2-pkgconf.patch b/package/freetype2/patches/freetype2-pkgconf.patch similarity index 100% rename from patches/freetype2-pkgconf.patch rename to package/freetype2/patches/freetype2-pkgconf.patch diff --git a/patches/freetype2-subpixel.patch b/package/freetype2/patches/freetype2-subpixel.patch similarity index 100% rename from patches/freetype2-subpixel.patch rename to package/freetype2/patches/freetype2-subpixel.patch diff --git a/patches/glib2-automake.patch b/package/glib2/patches/glib2-automake.patch similarity index 100% rename from patches/glib2-automake.patch rename to package/glib2/patches/glib2-automake.patch diff --git a/patches/glib2-disable-tests.patch b/package/glib2/patches/glib2-disable-tests.patch similarity index 100% rename from patches/glib2-disable-tests.patch rename to package/glib2/patches/glib2-disable-tests.patch diff --git a/patches/gptfdisk-ldlibs.patch b/package/gptfdisk/patches/gptfdisk-ldlibs.patch similarity index 100% rename from patches/gptfdisk-ldlibs.patch rename to package/gptfdisk/patches/gptfdisk-ldlibs.patch diff --git a/patches/graphlcd-base/0003-strip-graphlcd-conf.patch b/package/graphlcd-base/patches/0003-strip-graphlcd-conf.patch similarity index 100% rename from patches/graphlcd-base/0003-strip-graphlcd-conf.patch rename to package/graphlcd-base/patches/0003-strip-graphlcd-conf.patch diff --git a/patches/graphlcd-base/0004-material-colors.patch b/package/graphlcd-base/patches/0004-material-colors.patch similarity index 100% rename from patches/graphlcd-base/0004-material-colors.patch rename to package/graphlcd-base/patches/0004-material-colors.patch diff --git a/patches/graphlcd-base/0005-add-vuplus-driver.patch b/package/graphlcd-base/patches/0005-add-vuplus-driver.patch similarity index 100% rename from patches/graphlcd-base/0005-add-vuplus-driver.patch rename to package/graphlcd-base/patches/0005-add-vuplus-driver.patch diff --git a/patches/graphlcd-base/graphlcd.patch b/package/graphlcd-base/patches/graphlcd.patch similarity index 100% rename from patches/graphlcd-base/graphlcd.patch rename to package/graphlcd-base/patches/graphlcd.patch diff --git a/patches/harfbuzz-disable-docs.patch b/package/harfbuzz/patches/harfbuzz-disable-docs.patch similarity index 100% rename from patches/harfbuzz-disable-docs.patch rename to package/harfbuzz/patches/harfbuzz-disable-docs.patch diff --git a/patches/hi3798mv200-support.patch b/package/hd6x-mali-drivers/patches/hi3798mv200-support.patch similarity index 100% rename from patches/hi3798mv200-support.patch rename to package/hd6x-mali-drivers/patches/hi3798mv200-support.patch diff --git a/patches/hdparm/0001-cflags.patch b/package/hdparm/patches/0001-cflags.patch similarity index 100% rename from patches/hdparm/0001-cflags.patch rename to package/hdparm/patches/0001-cflags.patch diff --git a/patches/iperf-disable-profiling.patch b/package/iperf/patches/iperf-disable-profiling.patch similarity index 100% rename from patches/iperf-disable-profiling.patch rename to package/iperf/patches/iperf-disable-profiling.patch diff --git a/patches/initramfs-subdirboot.cpio.gz b/package/kernel/files/initramfs-subdirboot.cpio.gz similarity index 100% rename from patches/initramfs-subdirboot.cpio.gz rename to package/kernel/files/initramfs-subdirboot.cpio.gz diff --git a/configs/kernel-apollo.config b/package/kernel/files/kernel-apollo.defconfig similarity index 100% rename from configs/kernel-apollo.config rename to package/kernel/files/kernel-apollo.defconfig diff --git a/configs/kernel-hd5x.config b/package/kernel/files/kernel-hd5x.defconfig similarity index 100% rename from configs/kernel-hd5x.config rename to package/kernel/files/kernel-hd5x.defconfig diff --git a/configs/kernel-hd6x.config b/package/kernel/files/kernel-hd6x.defconfig similarity index 100% rename from configs/kernel-hd6x.config rename to package/kernel/files/kernel-hd6x.defconfig diff --git a/configs/kernel-kronos.config b/package/kernel/files/kernel-kronos.defconfig similarity index 100% rename from configs/kernel-kronos.config rename to package/kernel/files/kernel-kronos.defconfig diff --git a/configs/kernel-nevis.config b/package/kernel/files/kernel-nevis.defconfig similarity index 100% rename from configs/kernel-nevis.config rename to package/kernel/files/kernel-nevis.defconfig diff --git a/configs/kernel-vuduo.config b/package/kernel/files/kernel-vuduo.defconfig similarity index 100% rename from configs/kernel-vuduo.config rename to package/kernel/files/kernel-vuduo.defconfig diff --git a/configs/kernel-vuduo4k.config b/package/kernel/files/kernel-vuduo4k.defconfig similarity index 100% rename from configs/kernel-vuduo4k.config rename to package/kernel/files/kernel-vuduo4k.defconfig diff --git a/configs/kernel-vuduo4kse.config b/package/kernel/files/kernel-vuduo4kse.defconfig similarity index 100% rename from configs/kernel-vuduo4kse.config rename to package/kernel/files/kernel-vuduo4kse.defconfig diff --git a/configs/kernel-vusolo4k.config b/package/kernel/files/kernel-vusolo4k.defconfig similarity index 100% rename from configs/kernel-vusolo4k.config rename to package/kernel/files/kernel-vusolo4k.defconfig diff --git a/configs/kernel-vuultimo4k.config b/package/kernel/files/kernel-vuultimo4k.defconfig similarity index 100% rename from configs/kernel-vuultimo4k.config rename to package/kernel/files/kernel-vuultimo4k.defconfig diff --git a/configs/kernel-vuuno4k.config b/package/kernel/files/kernel-vuuno4k.defconfig similarity index 100% rename from configs/kernel-vuuno4k.config rename to package/kernel/files/kernel-vuuno4k.defconfig diff --git a/configs/kernel-vuuno4kse.config b/package/kernel/files/kernel-vuuno4kse.defconfig similarity index 100% rename from configs/kernel-vuuno4kse.config rename to package/kernel/files/kernel-vuuno4kse.defconfig diff --git a/configs/kernel-vuzero4k.config b/package/kernel/files/kernel-vuzero4k.defconfig similarity index 100% rename from configs/kernel-vuzero4k.config rename to package/kernel/files/kernel-vuzero4k.defconfig diff --git a/patches/kernel/gfutures/4_10_0001-export_pmpoweroffprepare.patch b/package/kernel/patches/gfutures/4_10_0001-export_pmpoweroffprepare.patch similarity index 100% rename from patches/kernel/gfutures/4_10_0001-export_pmpoweroffprepare.patch rename to package/kernel/patches/gfutures/4_10_0001-export_pmpoweroffprepare.patch diff --git a/patches/kernel/gfutures/4_10_0002-TBS-fixes-for-4.10-kernel.patch b/package/kernel/patches/gfutures/4_10_0002-TBS-fixes-for-4.10-kernel.patch similarity index 100% rename from patches/kernel/gfutures/4_10_0002-TBS-fixes-for-4.10-kernel.patch rename to package/kernel/patches/gfutures/4_10_0002-TBS-fixes-for-4.10-kernel.patch diff --git a/patches/kernel/gfutures/4_10_0003-Support-TBS-USB-drivers-for-4.6-kernel.patch b/package/kernel/patches/gfutures/4_10_0003-Support-TBS-USB-drivers-for-4.6-kernel.patch similarity index 100% rename from patches/kernel/gfutures/4_10_0003-Support-TBS-USB-drivers-for-4.6-kernel.patch rename to package/kernel/patches/gfutures/4_10_0003-Support-TBS-USB-drivers-for-4.6-kernel.patch diff --git a/patches/kernel/gfutures/4_10_0004-TBS-fixes-for-4.6-kernel.patch b/package/kernel/patches/gfutures/4_10_0004-TBS-fixes-for-4.6-kernel.patch similarity index 100% rename from patches/kernel/gfutures/4_10_0004-TBS-fixes-for-4.6-kernel.patch rename to package/kernel/patches/gfutures/4_10_0004-TBS-fixes-for-4.6-kernel.patch diff --git a/patches/kernel/gfutures/4_10_0005-STV-Add-PLS-support.patch b/package/kernel/patches/gfutures/4_10_0005-STV-Add-PLS-support.patch similarity index 100% rename from patches/kernel/gfutures/4_10_0005-STV-Add-PLS-support.patch rename to package/kernel/patches/gfutures/4_10_0005-STV-Add-PLS-support.patch diff --git a/patches/kernel/gfutures/4_10_0006-STV-Add-SNR-Signal-report-parameters.patch b/package/kernel/patches/gfutures/4_10_0006-STV-Add-SNR-Signal-report-parameters.patch similarity index 100% rename from patches/kernel/gfutures/4_10_0006-STV-Add-SNR-Signal-report-parameters.patch rename to package/kernel/patches/gfutures/4_10_0006-STV-Add-SNR-Signal-report-parameters.patch diff --git a/patches/kernel/gfutures/4_10_0007-blindscan2.patch b/package/kernel/patches/gfutures/4_10_0007-blindscan2.patch similarity index 100% rename from patches/kernel/gfutures/4_10_0007-blindscan2.patch rename to package/kernel/patches/gfutures/4_10_0007-blindscan2.patch diff --git a/patches/kernel/gfutures/4_10_0007-stv090x-optimized-TS-sync-control.patch b/package/kernel/patches/gfutures/4_10_0007-stv090x-optimized-TS-sync-control.patch similarity index 100% rename from patches/kernel/gfutures/4_10_0007-stv090x-optimized-TS-sync-control.patch rename to package/kernel/patches/gfutures/4_10_0007-stv090x-optimized-TS-sync-control.patch diff --git a/patches/kernel/gfutures/4_10_add-more-devices-rtl8xxxu.patch b/package/kernel/patches/gfutures/4_10_add-more-devices-rtl8xxxu.patch similarity index 100% rename from patches/kernel/gfutures/4_10_add-more-devices-rtl8xxxu.patch rename to package/kernel/patches/gfutures/4_10_add-more-devices-rtl8xxxu.patch diff --git a/patches/kernel/gfutures/4_10_bitsperlong.patch b/package/kernel/patches/gfutures/4_10_bitsperlong.patch similarity index 100% rename from patches/kernel/gfutures/4_10_bitsperlong.patch rename to package/kernel/patches/gfutures/4_10_bitsperlong.patch diff --git a/patches/kernel/gfutures/4_10_blacklist_mmc0.patch b/package/kernel/patches/gfutures/4_10_blacklist_mmc0.patch similarity index 100% rename from patches/kernel/gfutures/4_10_blacklist_mmc0.patch rename to package/kernel/patches/gfutures/4_10_blacklist_mmc0.patch diff --git a/patches/kernel/gfutures/4_10_dvbs2x.patch b/package/kernel/patches/gfutures/4_10_dvbs2x.patch similarity index 100% rename from patches/kernel/gfutures/4_10_dvbs2x.patch rename to package/kernel/patches/gfutures/4_10_dvbs2x.patch diff --git a/patches/kernel/gfutures/4_10_reserve_dvb_adapter_0.patch b/package/kernel/patches/gfutures/4_10_reserve_dvb_adapter_0.patch similarity index 100% rename from patches/kernel/gfutures/4_10_reserve_dvb_adapter_0.patch rename to package/kernel/patches/gfutures/4_10_reserve_dvb_adapter_0.patch diff --git a/patches/kernel/gfutures/4_10_t230c2.patch b/package/kernel/patches/gfutures/4_10_t230c2.patch similarity index 100% rename from patches/kernel/gfutures/4_10_t230c2.patch rename to package/kernel/patches/gfutures/4_10_t230c2.patch diff --git a/patches/kernel/gfutures/4_4_0001-remote.patch b/package/kernel/patches/gfutures/4_4_0001-remote.patch similarity index 100% rename from patches/kernel/gfutures/4_4_0001-remote.patch rename to package/kernel/patches/gfutures/4_4_0001-remote.patch diff --git a/patches/kernel/gfutures/4_4_0002-log2-give-up-on-gcc-constant-optimizations.patch b/package/kernel/patches/gfutures/4_4_0002-log2-give-up-on-gcc-constant-optimizations.patch similarity index 100% rename from patches/kernel/gfutures/4_4_0002-log2-give-up-on-gcc-constant-optimizations.patch rename to package/kernel/patches/gfutures/4_4_0002-log2-give-up-on-gcc-constant-optimizations.patch diff --git a/patches/kernel/gfutures/4_4_0003-dont-mark-register-as-const.patch b/package/kernel/patches/gfutures/4_4_0003-dont-mark-register-as-const.patch similarity index 100% rename from patches/kernel/gfutures/4_4_0003-dont-mark-register-as-const.patch rename to package/kernel/patches/gfutures/4_4_0003-dont-mark-register-as-const.patch diff --git a/patches/kernel/gfutures/4_4_ieee80211-increase-scan-result-expire-time.patch b/package/kernel/patches/gfutures/4_4_ieee80211-increase-scan-result-expire-time.patch similarity index 100% rename from patches/kernel/gfutures/4_4_ieee80211-increase-scan-result-expire-time.patch rename to package/kernel/patches/gfutures/4_4_ieee80211-increase-scan-result-expire-time.patch diff --git a/patches/kernel/vuplus/3_14_0001-STV-Add-PLS-support.patch b/package/kernel/patches/vuplus/3_14_0001-STV-Add-PLS-support.patch similarity index 100% rename from patches/kernel/vuplus/3_14_0001-STV-Add-PLS-support.patch rename to package/kernel/patches/vuplus/3_14_0001-STV-Add-PLS-support.patch diff --git a/patches/kernel/vuplus/3_14_0001-STV-Add-SNR-Signal-report-parameters.patch b/package/kernel/patches/vuplus/3_14_0001-STV-Add-SNR-Signal-report-parameters.patch similarity index 100% rename from patches/kernel/vuplus/3_14_0001-STV-Add-SNR-Signal-report-parameters.patch rename to package/kernel/patches/vuplus/3_14_0001-STV-Add-SNR-Signal-report-parameters.patch diff --git a/patches/kernel/vuplus/3_14_0001-Support-TBS-USB-drivers.patch b/package/kernel/patches/vuplus/3_14_0001-Support-TBS-USB-drivers.patch similarity index 100% rename from patches/kernel/vuplus/3_14_0001-Support-TBS-USB-drivers.patch rename to package/kernel/patches/vuplus/3_14_0001-Support-TBS-USB-drivers.patch diff --git a/patches/kernel/vuplus/3_14_0001-stv090x-optimized-TS-sync-control.patch b/package/kernel/patches/vuplus/3_14_0001-stv090x-optimized-TS-sync-control.patch similarity index 100% rename from patches/kernel/vuplus/3_14_0001-stv090x-optimized-TS-sync-control.patch rename to package/kernel/patches/vuplus/3_14_0001-stv090x-optimized-TS-sync-control.patch diff --git a/patches/kernel/vuplus/3_14_0001-tuners-tda18273-silicon-tuner-driver.patch b/package/kernel/patches/vuplus/3_14_0001-tuners-tda18273-silicon-tuner-driver.patch similarity index 100% rename from patches/kernel/vuplus/3_14_0001-tuners-tda18273-silicon-tuner-driver.patch rename to package/kernel/patches/vuplus/3_14_0001-tuners-tda18273-silicon-tuner-driver.patch diff --git a/patches/kernel/vuplus/3_14_0003-cxusb-Geniatech-T230-support.patch b/package/kernel/patches/vuplus/3_14_0003-cxusb-Geniatech-T230-support.patch similarity index 100% rename from patches/kernel/vuplus/3_14_0003-cxusb-Geniatech-T230-support.patch rename to package/kernel/patches/vuplus/3_14_0003-cxusb-Geniatech-T230-support.patch diff --git a/patches/kernel/vuplus/3_14_0004-log2-give-up-on-gcc-constant-optimizations.patch b/package/kernel/patches/vuplus/3_14_0004-log2-give-up-on-gcc-constant-optimizations.patch similarity index 100% rename from patches/kernel/vuplus/3_14_0004-log2-give-up-on-gcc-constant-optimizations.patch rename to package/kernel/patches/vuplus/3_14_0004-log2-give-up-on-gcc-constant-optimizations.patch diff --git a/patches/kernel/vuplus/3_14_0005-uaccess-dont-mark-register-as-const.patch b/package/kernel/patches/vuplus/3_14_0005-uaccess-dont-mark-register-as-const.patch similarity index 100% rename from patches/kernel/vuplus/3_14_0005-uaccess-dont-mark-register-as-const.patch rename to package/kernel/patches/vuplus/3_14_0005-uaccess-dont-mark-register-as-const.patch diff --git a/patches/kernel/vuplus/3_14_0006-makefile-disable-warnings.patch b/package/kernel/patches/vuplus/3_14_0006-makefile-disable-warnings.patch similarity index 100% rename from patches/kernel/vuplus/3_14_0006-makefile-disable-warnings.patch rename to package/kernel/patches/vuplus/3_14_0006-makefile-disable-warnings.patch diff --git a/patches/kernel/vuplus/3_14_01-10-si2157-Silicon-Labs-Si2157-silicon-tuner-driver.patch b/package/kernel/patches/vuplus/3_14_01-10-si2157-Silicon-Labs-Si2157-silicon-tuner-driver.patch similarity index 100% rename from patches/kernel/vuplus/3_14_01-10-si2157-Silicon-Labs-Si2157-silicon-tuner-driver.patch rename to package/kernel/patches/vuplus/3_14_01-10-si2157-Silicon-Labs-Si2157-silicon-tuner-driver.patch diff --git a/patches/kernel/vuplus/3_14_02-10-si2168-Silicon-Labs-Si2168-DVB-T-T2-C-demod-driver.patch b/package/kernel/patches/vuplus/3_14_02-10-si2168-Silicon-Labs-Si2168-DVB-T-T2-C-demod-driver.patch similarity index 100% rename from patches/kernel/vuplus/3_14_02-10-si2168-Silicon-Labs-Si2168-DVB-T-T2-C-demod-driver.patch rename to package/kernel/patches/vuplus/3_14_02-10-si2168-Silicon-Labs-Si2168-DVB-T-T2-C-demod-driver.patch diff --git a/patches/kernel/vuplus/3_14_CONFIG_DVB_SP2.patch b/package/kernel/patches/vuplus/3_14_CONFIG_DVB_SP2.patch similarity index 100% rename from patches/kernel/vuplus/3_14_CONFIG_DVB_SP2.patch rename to package/kernel/patches/vuplus/3_14_CONFIG_DVB_SP2.patch diff --git a/patches/kernel/vuplus/3_14_bcm_genet_disable_warn.patch b/package/kernel/patches/vuplus/3_14_bcm_genet_disable_warn.patch similarity index 100% rename from patches/kernel/vuplus/3_14_bcm_genet_disable_warn.patch rename to package/kernel/patches/vuplus/3_14_bcm_genet_disable_warn.patch diff --git a/patches/kernel/vuplus/3_14_bcmsysport_3.14.28-1.12.patch b/package/kernel/patches/vuplus/3_14_bcmsysport_3.14.28-1.12.patch similarity index 100% rename from patches/kernel/vuplus/3_14_bcmsysport_3.14.28-1.12.patch rename to package/kernel/patches/vuplus/3_14_bcmsysport_3.14.28-1.12.patch diff --git a/patches/kernel/vuplus/3_14_blindscan2.patch b/package/kernel/patches/vuplus/3_14_blindscan2.patch similarity index 100% rename from patches/kernel/vuplus/3_14_blindscan2.patch rename to package/kernel/patches/vuplus/3_14_blindscan2.patch diff --git a/patches/kernel/vuplus/3_14_dmx_source_dvr.patch b/package/kernel/patches/vuplus/3_14_dmx_source_dvr.patch similarity index 100% rename from patches/kernel/vuplus/3_14_dmx_source_dvr.patch rename to package/kernel/patches/vuplus/3_14_dmx_source_dvr.patch diff --git a/patches/kernel/vuplus/3_14_dvbs2x.patch b/package/kernel/patches/vuplus/3_14_dvbs2x.patch similarity index 100% rename from patches/kernel/vuplus/3_14_dvbs2x.patch rename to package/kernel/patches/vuplus/3_14_dvbs2x.patch diff --git a/patches/kernel/vuplus/3_14_dvbsky.patch b/package/kernel/patches/vuplus/3_14_dvbsky.patch similarity index 100% rename from patches/kernel/vuplus/3_14_dvbsky.patch rename to package/kernel/patches/vuplus/3_14_dvbsky.patch diff --git a/patches/kernel/vuplus/3_14_fix_mmc_3.14.28-1.10.patch b/package/kernel/patches/vuplus/3_14_fix_mmc_3.14.28-1.10.patch similarity index 100% rename from patches/kernel/vuplus/3_14_fix_mmc_3.14.28-1.10.patch rename to package/kernel/patches/vuplus/3_14_fix_mmc_3.14.28-1.10.patch diff --git a/patches/kernel/vuplus/3_14_genksyms_fix_typeof_handling.patch b/package/kernel/patches/vuplus/3_14_genksyms_fix_typeof_handling.patch similarity index 100% rename from patches/kernel/vuplus/3_14_genksyms_fix_typeof_handling.patch rename to package/kernel/patches/vuplus/3_14_genksyms_fix_typeof_handling.patch diff --git a/patches/kernel/vuplus/3_14_kernel-add-support-for-gcc6.patch b/package/kernel/patches/vuplus/3_14_kernel-add-support-for-gcc6.patch similarity index 100% rename from patches/kernel/vuplus/3_14_kernel-add-support-for-gcc6.patch rename to package/kernel/patches/vuplus/3_14_kernel-add-support-for-gcc6.patch diff --git a/patches/kernel/vuplus/3_14_kernel-add-support-for-gcc7.patch b/package/kernel/patches/vuplus/3_14_kernel-add-support-for-gcc7.patch similarity index 100% rename from patches/kernel/vuplus/3_14_kernel-add-support-for-gcc7.patch rename to package/kernel/patches/vuplus/3_14_kernel-add-support-for-gcc7.patch diff --git a/patches/kernel/vuplus/3_14_kernel-add-support-for-gcc8.patch b/package/kernel/patches/vuplus/3_14_kernel-add-support-for-gcc8.patch similarity index 100% rename from patches/kernel/vuplus/3_14_kernel-add-support-for-gcc8.patch rename to package/kernel/patches/vuplus/3_14_kernel-add-support-for-gcc8.patch diff --git a/patches/kernel/vuplus/3_14_kernel-add-support-for-gcc9.patch b/package/kernel/patches/vuplus/3_14_kernel-add-support-for-gcc9.patch similarity index 100% rename from patches/kernel/vuplus/3_14_kernel-add-support-for-gcc9.patch rename to package/kernel/patches/vuplus/3_14_kernel-add-support-for-gcc9.patch diff --git a/patches/kernel/vuplus/3_14_linux_dvb-core.patch b/package/kernel/patches/vuplus/3_14_linux_dvb-core.patch similarity index 100% rename from patches/kernel/vuplus/3_14_linux_dvb-core.patch rename to package/kernel/patches/vuplus/3_14_linux_dvb-core.patch diff --git a/patches/kernel/vuplus/3_14_linux_dvb_adapter.patch b/package/kernel/patches/vuplus/3_14_linux_dvb_adapter.patch similarity index 100% rename from patches/kernel/vuplus/3_14_linux_dvb_adapter.patch rename to package/kernel/patches/vuplus/3_14_linux_dvb_adapter.patch diff --git a/patches/kernel/vuplus/3_14_linux_prevent_usb_dma_from_bmem.patch b/package/kernel/patches/vuplus/3_14_linux_prevent_usb_dma_from_bmem.patch similarity index 100% rename from patches/kernel/vuplus/3_14_linux_prevent_usb_dma_from_bmem.patch rename to package/kernel/patches/vuplus/3_14_linux_prevent_usb_dma_from_bmem.patch diff --git a/patches/kernel/vuplus/3_14_linux_rpmb_not_alloc.patch b/package/kernel/patches/vuplus/3_14_linux_rpmb_not_alloc.patch similarity index 100% rename from patches/kernel/vuplus/3_14_linux_rpmb_not_alloc.patch rename to package/kernel/patches/vuplus/3_14_linux_rpmb_not_alloc.patch diff --git a/patches/kernel/vuplus/3_14_rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch b/package/kernel/patches/vuplus/3_14_rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch similarity index 100% rename from patches/kernel/vuplus/3_14_rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch rename to package/kernel/patches/vuplus/3_14_rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch diff --git a/patches/kernel/vuplus/3_14_rtl2832u-2.patch b/package/kernel/patches/vuplus/3_14_rtl2832u-2.patch similarity index 100% rename from patches/kernel/vuplus/3_14_rtl2832u-2.patch rename to package/kernel/patches/vuplus/3_14_rtl2832u-2.patch diff --git a/patches/kernel/vuplus/3_14_rtl8712_fix_build_error.patch b/package/kernel/patches/vuplus/3_14_rtl8712_fix_build_error.patch similarity index 100% rename from patches/kernel/vuplus/3_14_rtl8712_fix_build_error.patch rename to package/kernel/patches/vuplus/3_14_rtl8712_fix_build_error.patch diff --git a/patches/kernel/vuplus/3_14_usb_core_hub_msleep.patch b/package/kernel/patches/vuplus/3_14_usb_core_hub_msleep.patch similarity index 100% rename from patches/kernel/vuplus/3_14_usb_core_hub_msleep.patch rename to package/kernel/patches/vuplus/3_14_usb_core_hub_msleep.patch diff --git a/patches/kernel/vuplus/3_9_0001-STV-Add-PLS-support.patch b/package/kernel/patches/vuplus/3_9_0001-STV-Add-PLS-support.patch similarity index 100% rename from patches/kernel/vuplus/3_9_0001-STV-Add-PLS-support.patch rename to package/kernel/patches/vuplus/3_9_0001-STV-Add-PLS-support.patch diff --git a/patches/kernel/vuplus/3_9_0001-STV-Add-SNR-Signal-report-parameters.patch b/package/kernel/patches/vuplus/3_9_0001-STV-Add-SNR-Signal-report-parameters.patch similarity index 100% rename from patches/kernel/vuplus/3_9_0001-STV-Add-SNR-Signal-report-parameters.patch rename to package/kernel/patches/vuplus/3_9_0001-STV-Add-SNR-Signal-report-parameters.patch diff --git a/patches/kernel/vuplus/3_9_0001-Support-TBS-USB-drivers-3.9.patch b/package/kernel/patches/vuplus/3_9_0001-Support-TBS-USB-drivers-3.9.patch similarity index 100% rename from patches/kernel/vuplus/3_9_0001-Support-TBS-USB-drivers-3.9.patch rename to package/kernel/patches/vuplus/3_9_0001-Support-TBS-USB-drivers-3.9.patch diff --git a/patches/kernel/vuplus/3_9_0001-rt2800usb-add-support-for-rt55xx.patch b/package/kernel/patches/vuplus/3_9_0001-rt2800usb-add-support-for-rt55xx.patch similarity index 100% rename from patches/kernel/vuplus/3_9_0001-rt2800usb-add-support-for-rt55xx.patch rename to package/kernel/patches/vuplus/3_9_0001-rt2800usb-add-support-for-rt55xx.patch diff --git a/patches/kernel/vuplus/3_9_0001-stv090x-optimized-TS-sync-control.patch b/package/kernel/patches/vuplus/3_9_0001-stv090x-optimized-TS-sync-control.patch similarity index 100% rename from patches/kernel/vuplus/3_9_0001-stv090x-optimized-TS-sync-control.patch rename to package/kernel/patches/vuplus/3_9_0001-stv090x-optimized-TS-sync-control.patch diff --git a/patches/kernel/vuplus/3_9_01-10-si2157-Silicon-Labs-Si2157-silicon-tuner-driver.patch b/package/kernel/patches/vuplus/3_9_01-10-si2157-Silicon-Labs-Si2157-silicon-tuner-driver.patch similarity index 100% rename from patches/kernel/vuplus/3_9_01-10-si2157-Silicon-Labs-Si2157-silicon-tuner-driver.patch rename to package/kernel/patches/vuplus/3_9_01-10-si2157-Silicon-Labs-Si2157-silicon-tuner-driver.patch diff --git a/patches/kernel/vuplus/3_9_02-10-si2168-Silicon-Labs-Si2168-DVB-T-T2-C-demod-driver.patch b/package/kernel/patches/vuplus/3_9_02-10-si2168-Silicon-Labs-Si2168-DVB-T-T2-C-demod-driver.patch similarity index 100% rename from patches/kernel/vuplus/3_9_02-10-si2168-Silicon-Labs-Si2168-DVB-T-T2-C-demod-driver.patch rename to package/kernel/patches/vuplus/3_9_02-10-si2168-Silicon-Labs-Si2168-DVB-T-T2-C-demod-driver.patch diff --git a/patches/kernel/vuplus/3_9_CONFIG_DVB_SP2.patch b/package/kernel/patches/vuplus/3_9_CONFIG_DVB_SP2.patch similarity index 100% rename from patches/kernel/vuplus/3_9_CONFIG_DVB_SP2.patch rename to package/kernel/patches/vuplus/3_9_CONFIG_DVB_SP2.patch diff --git a/patches/kernel/vuplus/3_9_add-dmx-source-timecode.patch b/package/kernel/patches/vuplus/3_9_add-dmx-source-timecode.patch similarity index 100% rename from patches/kernel/vuplus/3_9_add-dmx-source-timecode.patch rename to package/kernel/patches/vuplus/3_9_add-dmx-source-timecode.patch diff --git a/patches/kernel/vuplus/3_9_af9015-output-full-range-SNR.patch b/package/kernel/patches/vuplus/3_9_af9015-output-full-range-SNR.patch similarity index 100% rename from patches/kernel/vuplus/3_9_af9015-output-full-range-SNR.patch rename to package/kernel/patches/vuplus/3_9_af9015-output-full-range-SNR.patch diff --git a/patches/kernel/vuplus/3_9_af9033-output-full-range-SNR.patch b/package/kernel/patches/vuplus/3_9_af9033-output-full-range-SNR.patch similarity index 100% rename from patches/kernel/vuplus/3_9_af9033-output-full-range-SNR.patch rename to package/kernel/patches/vuplus/3_9_af9033-output-full-range-SNR.patch diff --git a/patches/kernel/vuplus/3_9_as102-adjust-signal-strength-report.patch b/package/kernel/patches/vuplus/3_9_as102-adjust-signal-strength-report.patch similarity index 100% rename from patches/kernel/vuplus/3_9_as102-adjust-signal-strength-report.patch rename to package/kernel/patches/vuplus/3_9_as102-adjust-signal-strength-report.patch diff --git a/patches/kernel/vuplus/3_9_as102-scale-MER-to-full-range.patch b/package/kernel/patches/vuplus/3_9_as102-scale-MER-to-full-range.patch similarity index 100% rename from patches/kernel/vuplus/3_9_as102-scale-MER-to-full-range.patch rename to package/kernel/patches/vuplus/3_9_as102-scale-MER-to-full-range.patch diff --git a/patches/kernel/vuplus/3_9_blindscan2.patch b/package/kernel/patches/vuplus/3_9_blindscan2.patch similarity index 100% rename from patches/kernel/vuplus/3_9_blindscan2.patch rename to package/kernel/patches/vuplus/3_9_blindscan2.patch diff --git a/patches/kernel/vuplus/3_9_cinergy_s2_usb_r2.patch b/package/kernel/patches/vuplus/3_9_cinergy_s2_usb_r2.patch similarity index 100% rename from patches/kernel/vuplus/3_9_cinergy_s2_usb_r2.patch rename to package/kernel/patches/vuplus/3_9_cinergy_s2_usb_r2.patch diff --git a/patches/kernel/vuplus/3_9_cxd2820r-output-full-range-SNR.patch b/package/kernel/patches/vuplus/3_9_cxd2820r-output-full-range-SNR.patch similarity index 100% rename from patches/kernel/vuplus/3_9_cxd2820r-output-full-range-SNR.patch rename to package/kernel/patches/vuplus/3_9_cxd2820r-output-full-range-SNR.patch diff --git a/patches/kernel/vuplus/3_9_dvb-usb-dib0700-disable-sleep.patch b/package/kernel/patches/vuplus/3_9_dvb-usb-dib0700-disable-sleep.patch similarity index 100% rename from patches/kernel/vuplus/3_9_dvb-usb-dib0700-disable-sleep.patch rename to package/kernel/patches/vuplus/3_9_dvb-usb-dib0700-disable-sleep.patch diff --git a/patches/kernel/vuplus/3_9_dvb_usb_disable_rc_polling.patch b/package/kernel/patches/vuplus/3_9_dvb_usb_disable_rc_polling.patch similarity index 100% rename from patches/kernel/vuplus/3_9_dvb_usb_disable_rc_polling.patch rename to package/kernel/patches/vuplus/3_9_dvb_usb_disable_rc_polling.patch diff --git a/patches/kernel/vuplus/3_9_dvbsky-t330.patch b/package/kernel/patches/vuplus/3_9_dvbsky-t330.patch similarity index 100% rename from patches/kernel/vuplus/3_9_dvbsky-t330.patch rename to package/kernel/patches/vuplus/3_9_dvbsky-t330.patch diff --git a/patches/kernel/vuplus/3_9_fix-dvb-siano-sms-order.patch b/package/kernel/patches/vuplus/3_9_fix-dvb-siano-sms-order.patch similarity index 100% rename from patches/kernel/vuplus/3_9_fix-dvb-siano-sms-order.patch rename to package/kernel/patches/vuplus/3_9_fix-dvb-siano-sms-order.patch diff --git a/patches/kernel/vuplus/3_9_fix_fuse_for_linux_mips_3-9.patch b/package/kernel/patches/vuplus/3_9_fix_fuse_for_linux_mips_3-9.patch similarity index 100% rename from patches/kernel/vuplus/3_9_fix_fuse_for_linux_mips_3-9.patch rename to package/kernel/patches/vuplus/3_9_fix_fuse_for_linux_mips_3-9.patch diff --git a/patches/kernel/vuplus/3_9_fixed_mtd.patch b/package/kernel/patches/vuplus/3_9_fixed_mtd.patch similarity index 100% rename from patches/kernel/vuplus/3_9_fixed_mtd.patch rename to package/kernel/patches/vuplus/3_9_fixed_mtd.patch diff --git a/patches/kernel/vuplus/3_9_genksyms_fix_typeof_handling.patch b/package/kernel/patches/vuplus/3_9_genksyms_fix_typeof_handling.patch similarity index 100% rename from patches/kernel/vuplus/3_9_genksyms_fix_typeof_handling.patch rename to package/kernel/patches/vuplus/3_9_genksyms_fix_typeof_handling.patch diff --git a/patches/kernel/vuplus/3_9_it913x-switch-off-PID-filter-by-default.patch b/package/kernel/patches/vuplus/3_9_it913x-switch-off-PID-filter-by-default.patch similarity index 100% rename from patches/kernel/vuplus/3_9_it913x-switch-off-PID-filter-by-default.patch rename to package/kernel/patches/vuplus/3_9_it913x-switch-off-PID-filter-by-default.patch diff --git a/patches/kernel/vuplus/3_9_kernel-add-support-for-gcc5.patch b/package/kernel/patches/vuplus/3_9_kernel-add-support-for-gcc5.patch similarity index 100% rename from patches/kernel/vuplus/3_9_kernel-add-support-for-gcc5.patch rename to package/kernel/patches/vuplus/3_9_kernel-add-support-for-gcc5.patch diff --git a/patches/kernel/vuplus/3_9_kernel-add-support-for-gcc6.patch b/package/kernel/patches/vuplus/3_9_kernel-add-support-for-gcc6.patch similarity index 100% rename from patches/kernel/vuplus/3_9_kernel-add-support-for-gcc6.patch rename to package/kernel/patches/vuplus/3_9_kernel-add-support-for-gcc6.patch diff --git a/patches/kernel/vuplus/3_9_kernel-add-support-for-gcc7.patch b/package/kernel/patches/vuplus/3_9_kernel-add-support-for-gcc7.patch similarity index 100% rename from patches/kernel/vuplus/3_9_kernel-add-support-for-gcc7.patch rename to package/kernel/patches/vuplus/3_9_kernel-add-support-for-gcc7.patch diff --git a/patches/kernel/vuplus/3_9_kernel-add-support-for-gcc8.patch b/package/kernel/patches/vuplus/3_9_kernel-add-support-for-gcc8.patch similarity index 100% rename from patches/kernel/vuplus/3_9_kernel-add-support-for-gcc8.patch rename to package/kernel/patches/vuplus/3_9_kernel-add-support-for-gcc8.patch diff --git a/patches/kernel/vuplus/3_9_kernel-add-support-for-gcc9.patch b/package/kernel/patches/vuplus/3_9_kernel-add-support-for-gcc9.patch similarity index 100% rename from patches/kernel/vuplus/3_9_kernel-add-support-for-gcc9.patch rename to package/kernel/patches/vuplus/3_9_kernel-add-support-for-gcc9.patch diff --git a/patches/kernel/vuplus/3_9_linux-3.9-gcc-4.9.3-build-error-fixed.patch b/package/kernel/patches/vuplus/3_9_linux-3.9-gcc-4.9.3-build-error-fixed.patch similarity index 100% rename from patches/kernel/vuplus/3_9_linux-3.9-gcc-4.9.3-build-error-fixed.patch rename to package/kernel/patches/vuplus/3_9_linux-3.9-gcc-4.9.3-build-error-fixed.patch diff --git a/patches/kernel/vuplus/3_9_linux-sata_bcm.patch b/package/kernel/patches/vuplus/3_9_linux-sata_bcm.patch similarity index 100% rename from patches/kernel/vuplus/3_9_linux-sata_bcm.patch rename to package/kernel/patches/vuplus/3_9_linux-sata_bcm.patch diff --git a/patches/kernel/vuplus/3_9_mxl5007t-add-no_probe-and-no_reset-parameters.patch b/package/kernel/patches/vuplus/3_9_mxl5007t-add-no_probe-and-no_reset-parameters.patch similarity index 100% rename from patches/kernel/vuplus/3_9_mxl5007t-add-no_probe-and-no_reset-parameters.patch rename to package/kernel/patches/vuplus/3_9_mxl5007t-add-no_probe-and-no_reset-parameters.patch diff --git a/patches/kernel/vuplus/3_9_nfs-max-rwsize-8k.patch b/package/kernel/patches/vuplus/3_9_nfs-max-rwsize-8k.patch similarity index 100% rename from patches/kernel/vuplus/3_9_nfs-max-rwsize-8k.patch rename to package/kernel/patches/vuplus/3_9_nfs-max-rwsize-8k.patch diff --git a/patches/kernel/vuplus/3_9_rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch b/package/kernel/patches/vuplus/3_9_rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch similarity index 100% rename from patches/kernel/vuplus/3_9_rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch rename to package/kernel/patches/vuplus/3_9_rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch diff --git a/patches/kernel/vuplus/3_9_rtl8187se-fix-warnings.patch b/package/kernel/patches/vuplus/3_9_rtl8187se-fix-warnings.patch similarity index 100% rename from patches/kernel/vuplus/3_9_rtl8187se-fix-warnings.patch rename to package/kernel/patches/vuplus/3_9_rtl8187se-fix-warnings.patch diff --git a/patches/kernel/vuplus/3_9_rtl8712-fix-warnings.patch b/package/kernel/patches/vuplus/3_9_rtl8712-fix-warnings.patch similarity index 100% rename from patches/kernel/vuplus/3_9_rtl8712-fix-warnings.patch rename to package/kernel/patches/vuplus/3_9_rtl8712-fix-warnings.patch diff --git a/patches/kernel/vuplus/3_9_tda18271-advertise-supported-delsys.patch b/package/kernel/patches/vuplus/3_9_tda18271-advertise-supported-delsys.patch similarity index 100% rename from patches/kernel/vuplus/3_9_tda18271-advertise-supported-delsys.patch rename to package/kernel/patches/vuplus/3_9_tda18271-advertise-supported-delsys.patch diff --git a/patches/kernel/vuplus/3_9_test.patch b/package/kernel/patches/vuplus/3_9_test.patch similarity index 100% rename from patches/kernel/vuplus/3_9_test.patch rename to package/kernel/patches/vuplus/3_9_test.patch diff --git a/patches/kernel/vuplus/4_1_0001-STV-Add-PLS-support.patch b/package/kernel/patches/vuplus/4_1_0001-STV-Add-PLS-support.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0001-STV-Add-PLS-support.patch rename to package/kernel/patches/vuplus/4_1_0001-STV-Add-PLS-support.patch diff --git a/patches/kernel/vuplus/4_1_0001-STV-Add-SNR-Signal-report-parameters.patch b/package/kernel/patches/vuplus/4_1_0001-STV-Add-SNR-Signal-report-parameters.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0001-STV-Add-SNR-Signal-report-parameters.patch rename to package/kernel/patches/vuplus/4_1_0001-STV-Add-SNR-Signal-report-parameters.patch diff --git a/patches/kernel/vuplus/4_1_0001-Support-TBS-USB-drivers-for-4.1-kernel.patch b/package/kernel/patches/vuplus/4_1_0001-Support-TBS-USB-drivers-for-4.1-kernel.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0001-Support-TBS-USB-drivers-for-4.1-kernel.patch rename to package/kernel/patches/vuplus/4_1_0001-Support-TBS-USB-drivers-for-4.1-kernel.patch diff --git a/patches/kernel/vuplus/4_1_0001-TBS-fixes-for-4.1-kernel.patch b/package/kernel/patches/vuplus/4_1_0001-TBS-fixes-for-4.1-kernel.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0001-TBS-fixes-for-4.1-kernel.patch rename to package/kernel/patches/vuplus/4_1_0001-TBS-fixes-for-4.1-kernel.patch diff --git a/patches/kernel/vuplus/4_1_0001-dvb-usb-fix-a867.patch b/package/kernel/patches/vuplus/4_1_0001-dvb-usb-fix-a867.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0001-dvb-usb-fix-a867.patch rename to package/kernel/patches/vuplus/4_1_0001-dvb-usb-fix-a867.patch diff --git a/patches/kernel/vuplus/4_1_0001-regmap-add-regmap_write_bits.patch b/package/kernel/patches/vuplus/4_1_0001-regmap-add-regmap_write_bits.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0001-regmap-add-regmap_write_bits.patch rename to package/kernel/patches/vuplus/4_1_0001-regmap-add-regmap_write_bits.patch diff --git a/patches/kernel/vuplus/4_1_0001-stv090x-optimized-TS-sync-control.patch b/package/kernel/patches/vuplus/4_1_0001-stv090x-optimized-TS-sync-control.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0001-stv090x-optimized-TS-sync-control.patch rename to package/kernel/patches/vuplus/4_1_0001-stv090x-optimized-TS-sync-control.patch diff --git a/patches/kernel/vuplus/4_1_0002-af9035-fix-device-order-in-ID-list.patch b/package/kernel/patches/vuplus/4_1_0002-af9035-fix-device-order-in-ID-list.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0002-af9035-fix-device-order-in-ID-list.patch rename to package/kernel/patches/vuplus/4_1_0002-af9035-fix-device-order-in-ID-list.patch diff --git a/patches/kernel/vuplus/4_1_0002-log2-give-up-on-gcc-constant-optimizations.patch b/package/kernel/patches/vuplus/4_1_0002-log2-give-up-on-gcc-constant-optimizations.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0002-log2-give-up-on-gcc-constant-optimizations.patch rename to package/kernel/patches/vuplus/4_1_0002-log2-give-up-on-gcc-constant-optimizations.patch diff --git a/patches/kernel/vuplus/4_1_0003-Add-support-for-dvb-usb-stick-Hauppauge-WinTV-soloHD.patch b/package/kernel/patches/vuplus/4_1_0003-Add-support-for-dvb-usb-stick-Hauppauge-WinTV-soloHD.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0003-Add-support-for-dvb-usb-stick-Hauppauge-WinTV-soloHD.patch rename to package/kernel/patches/vuplus/4_1_0003-Add-support-for-dvb-usb-stick-Hauppauge-WinTV-soloHD.patch diff --git a/patches/kernel/vuplus/4_1_0003-uaccess-dont-mark-register-as-const.patch b/package/kernel/patches/vuplus/4_1_0003-uaccess-dont-mark-register-as-const.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0003-uaccess-dont-mark-register-as-const.patch rename to package/kernel/patches/vuplus/4_1_0003-uaccess-dont-mark-register-as-const.patch diff --git a/patches/kernel/vuplus/4_1_0004-af9035-add-USB-ID-07ca-0337-AVerMedia-HD-Volar-A867.patch b/package/kernel/patches/vuplus/4_1_0004-af9035-add-USB-ID-07ca-0337-AVerMedia-HD-Volar-A867.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0004-af9035-add-USB-ID-07ca-0337-AVerMedia-HD-Volar-A867.patch rename to package/kernel/patches/vuplus/4_1_0004-af9035-add-USB-ID-07ca-0337-AVerMedia-HD-Volar-A867.patch diff --git a/patches/kernel/vuplus/4_1_0005-Add-support-for-EVOLVEO-XtraTV-stick.patch b/package/kernel/patches/vuplus/4_1_0005-Add-support-for-EVOLVEO-XtraTV-stick.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0005-Add-support-for-EVOLVEO-XtraTV-stick.patch rename to package/kernel/patches/vuplus/4_1_0005-Add-support-for-EVOLVEO-XtraTV-stick.patch diff --git a/patches/kernel/vuplus/4_1_0006-dib8000-Add-support-for-Mygica-Geniatech-S2870.patch b/package/kernel/patches/vuplus/4_1_0006-dib8000-Add-support-for-Mygica-Geniatech-S2870.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0006-dib8000-Add-support-for-Mygica-Geniatech-S2870.patch rename to package/kernel/patches/vuplus/4_1_0006-dib8000-Add-support-for-Mygica-Geniatech-S2870.patch diff --git a/patches/kernel/vuplus/4_1_0007-dib0700-add-USB-ID-for-another-STK8096-PVR-ref-desig.patch b/package/kernel/patches/vuplus/4_1_0007-dib0700-add-USB-ID-for-another-STK8096-PVR-ref-desig.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0007-dib0700-add-USB-ID-for-another-STK8096-PVR-ref-desig.patch rename to package/kernel/patches/vuplus/4_1_0007-dib0700-add-USB-ID-for-another-STK8096-PVR-ref-desig.patch diff --git a/patches/kernel/vuplus/4_1_0008-add-Hama-Hybrid-DVB-T-Stick-support.patch b/package/kernel/patches/vuplus/4_1_0008-add-Hama-Hybrid-DVB-T-Stick-support.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0008-add-Hama-Hybrid-DVB-T-Stick-support.patch rename to package/kernel/patches/vuplus/4_1_0008-add-Hama-Hybrid-DVB-T-Stick-support.patch diff --git a/patches/kernel/vuplus/4_1_0009-Add-Terratec-H7-Revision-4-to-DVBSky-driver.patch b/package/kernel/patches/vuplus/4_1_0009-Add-Terratec-H7-Revision-4-to-DVBSky-driver.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0009-Add-Terratec-H7-Revision-4-to-DVBSky-driver.patch rename to package/kernel/patches/vuplus/4_1_0009-Add-Terratec-H7-Revision-4-to-DVBSky-driver.patch diff --git a/patches/kernel/vuplus/4_1_0010-media-Added-support-for-the-TerraTec-T1-DVB-T-USB-tu.patch b/package/kernel/patches/vuplus/4_1_0010-media-Added-support-for-the-TerraTec-T1-DVB-T-USB-tu.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0010-media-Added-support-for-the-TerraTec-T1-DVB-T-USB-tu.patch rename to package/kernel/patches/vuplus/4_1_0010-media-Added-support-for-the-TerraTec-T1-DVB-T-USB-tu.patch diff --git a/patches/kernel/vuplus/4_1_0011-media-tda18250-support-for-new-silicon-tuner.patch b/package/kernel/patches/vuplus/4_1_0011-media-tda18250-support-for-new-silicon-tuner.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0011-media-tda18250-support-for-new-silicon-tuner.patch rename to package/kernel/patches/vuplus/4_1_0011-media-tda18250-support-for-new-silicon-tuner.patch diff --git a/patches/kernel/vuplus/4_1_0012-media-dib0700-add-support-for-Xbox-One-Digital-TV-Tu.patch b/package/kernel/patches/vuplus/4_1_0012-media-dib0700-add-support-for-Xbox-One-Digital-TV-Tu.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0012-media-dib0700-add-support-for-Xbox-One-Digital-TV-Tu.patch rename to package/kernel/patches/vuplus/4_1_0012-media-dib0700-add-support-for-Xbox-One-Digital-TV-Tu.patch diff --git a/patches/kernel/vuplus/4_1_0013-mn88472-Fix-possible-leak-in-mn88472_init.patch b/package/kernel/patches/vuplus/4_1_0013-mn88472-Fix-possible-leak-in-mn88472_init.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0013-mn88472-Fix-possible-leak-in-mn88472_init.patch rename to package/kernel/patches/vuplus/4_1_0013-mn88472-Fix-possible-leak-in-mn88472_init.patch diff --git a/patches/kernel/vuplus/4_1_0014-staging-media-Remove-unneeded-parentheses.patch b/package/kernel/patches/vuplus/4_1_0014-staging-media-Remove-unneeded-parentheses.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0014-staging-media-Remove-unneeded-parentheses.patch rename to package/kernel/patches/vuplus/4_1_0014-staging-media-Remove-unneeded-parentheses.patch diff --git a/patches/kernel/vuplus/4_1_0015-staging-media-mn88472-simplify-NULL-tests.patch b/package/kernel/patches/vuplus/4_1_0015-staging-media-mn88472-simplify-NULL-tests.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0015-staging-media-mn88472-simplify-NULL-tests.patch rename to package/kernel/patches/vuplus/4_1_0015-staging-media-mn88472-simplify-NULL-tests.patch diff --git a/patches/kernel/vuplus/4_1_0016-mn88472-fix-typo.patch b/package/kernel/patches/vuplus/4_1_0016-mn88472-fix-typo.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0016-mn88472-fix-typo.patch rename to package/kernel/patches/vuplus/4_1_0016-mn88472-fix-typo.patch diff --git a/patches/kernel/vuplus/4_1_0017-mn88472-finalize-driver.patch b/package/kernel/patches/vuplus/4_1_0017-mn88472-finalize-driver.patch similarity index 100% rename from patches/kernel/vuplus/4_1_0017-mn88472-finalize-driver.patch rename to package/kernel/patches/vuplus/4_1_0017-mn88472-finalize-driver.patch diff --git a/patches/kernel/vuplus/4_1_bcmgenet-recovery-fix.patch b/package/kernel/patches/vuplus/4_1_bcmgenet-recovery-fix.patch similarity index 100% rename from patches/kernel/vuplus/4_1_bcmgenet-recovery-fix.patch rename to package/kernel/patches/vuplus/4_1_bcmgenet-recovery-fix.patch diff --git a/patches/kernel/vuplus/4_1_bcmsysport_4_1_45.patch b/package/kernel/patches/vuplus/4_1_bcmsysport_4_1_45.patch similarity index 100% rename from patches/kernel/vuplus/4_1_bcmsysport_4_1_45.patch rename to package/kernel/patches/vuplus/4_1_bcmsysport_4_1_45.patch diff --git a/patches/kernel/vuplus/4_1_blindscan2.patch b/package/kernel/patches/vuplus/4_1_blindscan2.patch similarity index 100% rename from patches/kernel/vuplus/4_1_blindscan2.patch rename to package/kernel/patches/vuplus/4_1_blindscan2.patch diff --git a/patches/kernel/vuplus/4_1_dmx_source_dvr.patch b/package/kernel/patches/vuplus/4_1_dmx_source_dvr.patch similarity index 100% rename from patches/kernel/vuplus/4_1_dmx_source_dvr.patch rename to package/kernel/patches/vuplus/4_1_dmx_source_dvr.patch diff --git a/patches/kernel/vuplus/4_1_kernel-add-support-for-gcc6.patch b/package/kernel/patches/vuplus/4_1_kernel-add-support-for-gcc6.patch similarity index 100% rename from patches/kernel/vuplus/4_1_kernel-add-support-for-gcc6.patch rename to package/kernel/patches/vuplus/4_1_kernel-add-support-for-gcc6.patch diff --git a/patches/kernel/vuplus/4_1_kernel-add-support-for-gcc7.patch b/package/kernel/patches/vuplus/4_1_kernel-add-support-for-gcc7.patch similarity index 100% rename from patches/kernel/vuplus/4_1_kernel-add-support-for-gcc7.patch rename to package/kernel/patches/vuplus/4_1_kernel-add-support-for-gcc7.patch diff --git a/patches/kernel/vuplus/4_1_kernel-add-support-for-gcc8.patch b/package/kernel/patches/vuplus/4_1_kernel-add-support-for-gcc8.patch similarity index 100% rename from patches/kernel/vuplus/4_1_kernel-add-support-for-gcc8.patch rename to package/kernel/patches/vuplus/4_1_kernel-add-support-for-gcc8.patch diff --git a/patches/kernel/vuplus/4_1_kernel-add-support-for-gcc9.patch b/package/kernel/patches/vuplus/4_1_kernel-add-support-for-gcc9.patch similarity index 100% rename from patches/kernel/vuplus/4_1_kernel-add-support-for-gcc9.patch rename to package/kernel/patches/vuplus/4_1_kernel-add-support-for-gcc9.patch diff --git a/patches/kernel/vuplus/4_1_linux_4_1_45_dvbs2x.patch b/package/kernel/patches/vuplus/4_1_linux_4_1_45_dvbs2x.patch similarity index 100% rename from patches/kernel/vuplus/4_1_linux_4_1_45_dvbs2x.patch rename to package/kernel/patches/vuplus/4_1_linux_4_1_45_dvbs2x.patch diff --git a/patches/kernel/vuplus/4_1_linux_dvb-core.patch b/package/kernel/patches/vuplus/4_1_linux_dvb-core.patch similarity index 100% rename from patches/kernel/vuplus/4_1_linux_dvb-core.patch rename to package/kernel/patches/vuplus/4_1_linux_dvb-core.patch diff --git a/patches/kernel/vuplus/4_1_linux_dvb_adapter.patch b/package/kernel/patches/vuplus/4_1_linux_dvb_adapter.patch similarity index 100% rename from patches/kernel/vuplus/4_1_linux_dvb_adapter.patch rename to package/kernel/patches/vuplus/4_1_linux_dvb_adapter.patch diff --git a/patches/kernel/vuplus/4_1_linux_rpmb_not_alloc.patch b/package/kernel/patches/vuplus/4_1_linux_rpmb_not_alloc.patch similarity index 100% rename from patches/kernel/vuplus/4_1_linux_rpmb_not_alloc.patch rename to package/kernel/patches/vuplus/4_1_linux_rpmb_not_alloc.patch diff --git a/patches/kernel/vuplus/4_1_linux_usb_hub.patch b/package/kernel/patches/vuplus/4_1_linux_usb_hub.patch similarity index 100% rename from patches/kernel/vuplus/4_1_linux_usb_hub.patch rename to package/kernel/patches/vuplus/4_1_linux_usb_hub.patch diff --git a/patches/libass.patch b/package/libass/patches/libass.patch similarity index 100% rename from patches/libass.patch rename to package/libass/patches/libass.patch diff --git a/patches/libbluray.patch b/package/libbluray/patches/libbluray.patch similarity index 100% rename from patches/libbluray.patch rename to package/libbluray/patches/libbluray.patch diff --git a/patches/libdpf-crossbuild.patch b/package/libdpf/patches/libdpf-crossbuild.patch similarity index 80% rename from patches/libdpf-crossbuild.patch rename to package/libdpf/patches/libdpf-crossbuild.patch index 9d4fa0fd..7a321f0a 100644 --- a/patches/libdpf-crossbuild.patch +++ b/package/libdpf/patches/libdpf-crossbuild.patch @@ -1,5 +1,5 @@ ---- a/Makefile -+++ b/Makefile +--- a/dpflib/Makefile ++++ b/dpflib/Makefile @@ -10,7 +10,7 @@ LIBS=-lusb -lsgutils2 endif diff --git a/patches/libdvbsi++-content_identifier_descriptor.patch b/package/libdvbsi/patches/libdvbsi++-content_identifier_descriptor.patch similarity index 100% rename from patches/libdvbsi++-content_identifier_descriptor.patch rename to package/libdvbsi/patches/libdvbsi++-content_identifier_descriptor.patch diff --git a/patches/libffi/0001-Fix-installation-location-of-libffi.patch b/package/libffi/patches/0001-Fix-installation-location-of-libffi.patch similarity index 100% rename from patches/libffi/0001-Fix-installation-location-of-libffi.patch rename to package/libffi/patches/0001-Fix-installation-location-of-libffi.patch diff --git a/patches/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch b/package/libffi/patches/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch similarity index 100% rename from patches/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch rename to package/libffi/patches/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch diff --git a/patches/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch b/package/libffi/patches/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch similarity index 100% rename from patches/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch rename to package/libffi/patches/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch diff --git a/patches/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch b/package/libffi/patches/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch similarity index 100% rename from patches/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch rename to package/libffi/patches/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch diff --git a/patches/libffi/0005-powerpc-fix-build-failure-on-power7-and-older.patch b/package/libffi/patches/0005-powerpc-fix-build-failure-on-power7-and-older.patch similarity index 100% rename from patches/libffi/0005-powerpc-fix-build-failure-on-power7-and-older.patch rename to package/libffi/patches/0005-powerpc-fix-build-failure-on-power7-and-older.patch diff --git a/patches/libffi/0006-Address-platforms-with-no-__int128.patch b/package/libffi/patches/0006-Address-platforms-with-no-__int128.patch similarity index 100% rename from patches/libffi/0006-Address-platforms-with-no-__int128.patch rename to package/libffi/patches/0006-Address-platforms-with-no-__int128.patch diff --git a/patches/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch b/package/libffi/patches/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch similarity index 100% rename from patches/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch rename to package/libffi/patches/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch diff --git a/patches/libid3tag-pc.patch b/package/libid3tag/patches/libid3tag-pc.patch similarity index 100% rename from patches/libid3tag-pc.patch rename to package/libid3tag/patches/libid3tag-pc.patch diff --git a/patches/libjpeg-turbo-tiff-ojpeg.patch b/package/libjpeg-turbo/patches/libjpeg-turbo-tiff-ojpeg.patch similarity index 100% rename from patches/libjpeg-turbo-tiff-ojpeg.patch rename to package/libjpeg-turbo/patches/libjpeg-turbo-tiff-ojpeg.patch diff --git a/patches/libmad-frame_length.diff b/package/libmad/patches/libmad-frame_length.diff similarity index 100% rename from patches/libmad-frame_length.diff rename to package/libmad/patches/libmad-frame_length.diff diff --git a/patches/libmad-mips-h-constraint-removal.patch b/package/libmad/patches/libmad-mips-h-constraint-removal.patch similarity index 100% rename from patches/libmad-mips-h-constraint-removal.patch rename to package/libmad/patches/libmad-mips-h-constraint-removal.patch diff --git a/patches/libmad-pc.patch b/package/libmad/patches/libmad-pc.patch similarity index 100% rename from patches/libmad-pc.patch rename to package/libmad/patches/libmad-pc.patch diff --git a/patches/libmad-remove-deprecated-cflags.patch b/package/libmad/patches/libmad-remove-deprecated-cflags.patch similarity index 100% rename from patches/libmad-remove-deprecated-cflags.patch rename to package/libmad/patches/libmad-remove-deprecated-cflags.patch diff --git a/patches/libmad-thumb2-fixed-arm.patch b/package/libmad/patches/libmad-thumb2-fixed-arm.patch similarity index 100% rename from patches/libmad-thumb2-fixed-arm.patch rename to package/libmad/patches/libmad-thumb2-fixed-arm.patch diff --git a/patches/libmad-thumb2-imdct-arm.patch b/package/libmad/patches/libmad-thumb2-imdct-arm.patch similarity index 100% rename from patches/libmad-thumb2-imdct-arm.patch rename to package/libmad/patches/libmad-thumb2-imdct-arm.patch diff --git a/patches/libpng-Disable-pngfix-and-png-fix-itxt.patch b/package/libpng/patches/libpng-Disable-pngfix-and-png-fix-itxt.patch similarity index 100% rename from patches/libpng-Disable-pngfix-and-png-fix-itxt.patch rename to package/libpng/patches/libpng-Disable-pngfix-and-png-fix-itxt.patch diff --git a/patches/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch b/package/libtirpc/patches/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch similarity index 100% rename from patches/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch rename to package/libtirpc/patches/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch diff --git a/patches/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch b/package/libtirpc/patches/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch similarity index 100% rename from patches/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch rename to package/libtirpc/patches/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch diff --git a/patches/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch b/package/libtirpc/patches/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch similarity index 100% rename from patches/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch rename to package/libtirpc/patches/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch diff --git a/patches/libusb-compat/0001-fix-a-build-issue-on-linux.patch b/package/libusb-compat/patches/0001-fix-a-build-issue-on-linux.patch similarity index 100% rename from patches/libusb-compat/0001-fix-a-build-issue-on-linux.patch rename to package/libusb-compat/patches/0001-fix-a-build-issue-on-linux.patch diff --git a/patches/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch b/package/libxml2/patches/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch similarity index 100% rename from patches/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch rename to package/libxml2/patches/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch diff --git a/patches/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch b/package/libxml2/patches/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch similarity index 100% rename from patches/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch rename to package/libxml2/patches/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch diff --git a/patches/links-ac-prog-cxx.patch b/package/links/patches/links-ac-prog-cxx.patch similarity index 100% rename from patches/links-ac-prog-cxx.patch rename to package/links/patches/links-ac-prog-cxx.patch diff --git a/patches/links-accept_https_play.patch b/package/links/patches/links-accept_https_play.patch similarity index 100% rename from patches/links-accept_https_play.patch rename to package/links/patches/links-accept_https_play.patch diff --git a/patches/links-input-event1.patch b/package/links/patches/links-input-event1.patch similarity index 100% rename from patches/links-input-event1.patch rename to package/links/patches/links-input-event1.patch diff --git a/patches/links-input-event2.patch b/package/links/patches/links-input-event2.patch similarity index 100% rename from patches/links-input-event2.patch rename to package/links/patches/links-input-event2.patch diff --git a/patches/links-input-nevis_ir.patch b/package/links/patches/links-input-nevis_ir.patch similarity index 100% rename from patches/links-input-nevis_ir.patch rename to package/links/patches/links-input-nevis_ir.patch diff --git a/patches/links.patch b/package/links/patches/links.patch similarity index 100% rename from patches/links.patch rename to package/links/patches/links.patch diff --git a/patches/lua-curl-Makefile.diff b/package/lua-curl/patches/lua-curl-Makefile.diff similarity index 100% rename from patches/lua-curl-Makefile.diff rename to package/lua-curl/patches/lua-curl-Makefile.diff diff --git a/patches/lua-feedparser.patch b/package/lua-feedparser/patches/lua-feedparser.patch similarity index 100% rename from patches/lua-feedparser.patch rename to package/lua-feedparser/patches/lua-feedparser.patch diff --git a/patches/lua-01-fix-LUA_ROOT.patch b/package/lua/patches/lua-01-fix-LUA_ROOT.patch similarity index 100% rename from patches/lua-01-fix-LUA_ROOT.patch rename to package/lua/patches/lua-01-fix-LUA_ROOT.patch diff --git a/patches/lua-01-remove-readline.patch b/package/lua/patches/lua-01-remove-readline.patch similarity index 100% rename from patches/lua-01-remove-readline.patch rename to package/lua/patches/lua-01-remove-readline.patch diff --git a/patches/lua-02-shared-libs-for-lua.patch b/package/lua/patches/lua-02-shared-libs-for-lua.patch similarity index 100% rename from patches/lua-02-shared-libs-for-lua.patch rename to package/lua/patches/lua-02-shared-libs-for-lua.patch diff --git a/patches/lua-03-lua-pc.patch b/package/lua/patches/lua-03-lua-pc.patch similarity index 100% rename from patches/lua-03-lua-pc.patch rename to package/lua/patches/lua-03-lua-pc.patch diff --git a/patches/lua-04-crashfix.diff b/package/lua/patches/lua-04-crashfix.diff similarity index 100% rename from patches/lua-04-crashfix.diff rename to package/lua/patches/lua-04-crashfix.diff diff --git a/patches/luaexpat-makefile.patch b/package/luaexpat/patches/luaexpat-makefile.patch similarity index 100% rename from patches/luaexpat-makefile.patch rename to package/luaexpat/patches/luaexpat-makefile.patch diff --git a/patches/luaposix-fix-docdir-build.patch b/package/luaposix/patches/luaposix-fix-docdir-build.patch similarity index 100% rename from patches/luaposix-fix-docdir-build.patch rename to package/luaposix/patches/luaposix-fix-docdir-build.patch diff --git a/configs/luarocks-config.lua b/package/luarocks/files/luarocks-config.lua similarity index 100% rename from configs/luarocks-config.lua rename to package/luarocks/files/luarocks-config.lua diff --git a/patches/luarocks-0001-allow-libluajit-detection.patch b/package/luarocks/patches/luarocks-0001-allow-libluajit-detection.patch similarity index 100% rename from patches/luarocks-0001-allow-libluajit-detection.patch rename to package/luarocks/patches/luarocks-0001-allow-libluajit-detection.patch diff --git a/patches/mc/0001-mc-replace-perl-w-with-use-warnings.patch b/package/mc/patches/0001-mc-replace-perl-w-with-use-warnings.patch similarity index 100% rename from patches/mc/0001-mc-replace-perl-w-with-use-warnings.patch rename to package/mc/patches/0001-mc-replace-perl-w-with-use-warnings.patch diff --git a/patches/mc/0002-nomandate.patch b/package/mc/patches/0002-nomandate.patch similarity index 100% rename from patches/mc/0002-nomandate.patch rename to package/mc/patches/0002-nomandate.patch diff --git a/patches/mc/0003-subshell.patch b/package/mc/patches/0003-subshell.patch similarity index 100% rename from patches/mc/0003-subshell.patch rename to package/mc/patches/0003-subshell.patch diff --git a/patches/mc/0004-fix-mouse-handling-newer-terminfo.patch b/package/mc/patches/0004-fix-mouse-handling-newer-terminfo.patch similarity index 100% rename from patches/mc/0004-fix-mouse-handling-newer-terminfo.patch rename to package/mc/patches/0004-fix-mouse-handling-newer-terminfo.patch diff --git a/patches/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch b/package/meson/patches/0001-Prefer-ext-static-libs-when-default-library-static.patch similarity index 100% rename from patches/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch rename to package/meson/patches/0001-Prefer-ext-static-libs-when-default-library-static.patch diff --git a/patches/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/package/meson/patches/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch similarity index 100% rename from patches/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch rename to package/meson/patches/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch diff --git a/patches/minicom-fix-h-v-return-value-is-not-0.patch b/package/minicom/patches/minicom-fix-h-v-return-value-is-not-0.patch similarity index 100% rename from patches/minicom-fix-h-v-return-value-is-not-0.patch rename to package/minicom/patches/minicom-fix-h-v-return-value-is-not-0.patch diff --git a/patches/minisatip/0001-change-bootid-path.patch b/package/minisatip/patches/0001-change-bootid-path.patch similarity index 100% rename from patches/minisatip/0001-change-bootid-path.patch rename to package/minisatip/patches/0001-change-bootid-path.patch diff --git a/patches/ncurses-gcc-5.x-MKlib_gen.patch b/package/ncurses/patches/ncurses-gcc-5.x-MKlib_gen.patch similarity index 100% rename from patches/ncurses-gcc-5.x-MKlib_gen.patch rename to package/ncurses/patches/ncurses-gcc-5.x-MKlib_gen.patch diff --git a/patches/nfs-utils_01-Patch-taken-from-Gentoo.patch b/package/nfs-utils/patches/nfs-utils_01-Patch-taken-from-Gentoo.patch similarity index 100% rename from patches/nfs-utils_01-Patch-taken-from-Gentoo.patch rename to package/nfs-utils/patches/nfs-utils_01-Patch-taken-from-Gentoo.patch diff --git a/patches/nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch b/package/nfs-utils/patches/nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch similarity index 100% rename from patches/nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch rename to package/nfs-utils/patches/nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch diff --git a/patches/nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-libt.patch b/package/nfs-utils/patches/nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-libt.patch similarity index 100% rename from patches/nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-libt.patch rename to package/nfs-utils/patches/nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-libt.patch diff --git a/patches/nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch b/package/nfs-utils/patches/nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch similarity index 100% rename from patches/nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch rename to package/nfs-utils/patches/nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch diff --git a/patches/ninja/0001-set-minimum-cmake-version.patch b/package/ninja/patches/0001-set-minimum-cmake-version.patch similarity index 100% rename from patches/ninja/0001-set-minimum-cmake-version.patch rename to package/ninja/patches/0001-set-minimum-cmake-version.patch diff --git a/patches/ninja/0002-remove-fdiagnostics-color-from-make-command.patch b/package/ninja/patches/0002-remove-fdiagnostics-color-from-make-command.patch similarity index 100% rename from patches/ninja/0002-remove-fdiagnostics-color-from-make-command.patch rename to package/ninja/patches/0002-remove-fdiagnostics-color-from-make-command.patch diff --git a/patches/ninja/0003-CMake-fix-object-library-usage.patch b/package/ninja/patches/0003-CMake-fix-object-library-usage.patch similarity index 100% rename from patches/ninja/0003-CMake-fix-object-library-usage.patch rename to package/ninja/patches/0003-CMake-fix-object-library-usage.patch diff --git a/patches/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch b/package/ntfs-3g/patches/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch similarity index 100% rename from patches/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch rename to package/ntfs-3g/patches/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch diff --git a/patches/ntp/0001-mkver_in.patch b/package/ntp/patches/0001-mkver_in.patch similarity index 100% rename from patches/ntp/0001-mkver_in.patch rename to package/ntp/patches/0001-mkver_in.patch diff --git a/patches/openssl/0000-Configure-align-O-flag.patch b/package/openssl/patches/0000-Configure-align-O-flag.patch similarity index 100% rename from patches/openssl/0000-Configure-align-O-flag.patch rename to package/openssl/patches/0000-Configure-align-O-flag.patch diff --git a/patches/pixman-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch b/package/pixman/patches/pixman-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch similarity index 100% rename from patches/pixman-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch rename to package/pixman/patches/pixman-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch diff --git a/patches/pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch b/package/pixman/patches/pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch similarity index 100% rename from patches/pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch rename to package/pixman/patches/pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch diff --git a/patches/pixman-asm_include.patch b/package/pixman/patches/pixman-asm_include.patch similarity index 100% rename from patches/pixman-asm_include.patch rename to package/pixman/patches/pixman-asm_include.patch diff --git a/patches/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch b/package/pkgconf/patches/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch similarity index 100% rename from patches/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch rename to package/pkgconf/patches/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch diff --git a/patches/procps-ng-no-tests-docs.patch b/package/procps-ng/patches/procps-ng-no-tests-docs.patch similarity index 100% rename from patches/procps-ng-no-tests-docs.patch rename to package/procps-ng/patches/procps-ng-no-tests-docs.patch diff --git a/patches/pugixml-config.patch b/package/pugixml/patches/pugixml-config.patch similarity index 100% rename from patches/pugixml-config.patch rename to package/pugixml/patches/pugixml-config.patch diff --git a/patches/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/patches/0001-add-executable.patch similarity index 100% rename from patches/python3-setuptools/0001-add-executable.patch rename to package/python3-setuptools/patches/0001-add-executable.patch diff --git a/patches/python3-setuptools/0002-change-shebang-to-python3.patch b/package/python3-setuptools/patches/0002-change-shebang-to-python3.patch similarity index 100% rename from patches/python3-setuptools/0002-change-shebang-to-python3.patch rename to package/python3-setuptools/patches/0002-change-shebang-to-python3.patch diff --git a/patches/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/patches/0001-Make-the-build-of-pyc-files-conditional.patch similarity index 100% rename from patches/python3/0001-Make-the-build-of-pyc-files-conditional.patch rename to package/python3/patches/0001-Make-the-build-of-pyc-files-conditional.patch diff --git a/patches/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/patches/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch similarity index 100% rename from patches/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch rename to package/python3/patches/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch diff --git a/patches/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/patches/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch similarity index 100% rename from patches/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch rename to package/python3/patches/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch diff --git a/patches/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/patches/0004-Adjust-library-header-paths-for-cross-compilation.patch similarity index 100% rename from patches/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch rename to package/python3/patches/0004-Adjust-library-header-paths-for-cross-compilation.patch diff --git a/patches/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/patches/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch similarity index 100% rename from patches/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch rename to package/python3/patches/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch diff --git a/patches/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/patches/0006-Don-t-add-multiarch-paths.patch similarity index 100% rename from patches/python3/0006-Don-t-add-multiarch-paths.patch rename to package/python3/patches/0006-Don-t-add-multiarch-paths.patch diff --git a/patches/python3/0007-Abort-on-failed-module-build.patch b/package/python3/patches/0007-Abort-on-failed-module-build.patch similarity index 100% rename from patches/python3/0007-Abort-on-failed-module-build.patch rename to package/python3/patches/0007-Abort-on-failed-module-build.patch diff --git a/patches/python3/0008-Serial-ioctl-workaround.patch b/package/python3/patches/0008-Serial-ioctl-workaround.patch similarity index 100% rename from patches/python3/0008-Serial-ioctl-workaround.patch rename to package/python3/patches/0008-Serial-ioctl-workaround.patch diff --git a/patches/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/patches/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch similarity index 100% rename from patches/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch rename to package/python3/patches/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch diff --git a/patches/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/patches/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch similarity index 100% rename from patches/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch rename to package/python3/patches/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch diff --git a/patches/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/patches/0011-Override-system-locale-and-set-to-default-when-addin.patch similarity index 100% rename from patches/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch rename to package/python3/patches/0011-Override-system-locale-and-set-to-default-when-addin.patch diff --git a/patches/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/patches/0012-Add-importlib-fix-for-PEP-3147-issue.patch similarity index 100% rename from patches/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch rename to package/python3/patches/0012-Add-importlib-fix-for-PEP-3147-issue.patch diff --git a/patches/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/package/python3/patches/0013-Add-an-option-to-disable-installation-of-test-module.patch similarity index 100% rename from patches/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch rename to package/python3/patches/0013-Add-an-option-to-disable-installation-of-test-module.patch diff --git a/patches/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/patches/0014-Add-an-option-to-disable-pydoc.patch similarity index 100% rename from patches/python3/0014-Add-an-option-to-disable-pydoc.patch rename to package/python3/patches/0014-Add-an-option-to-disable-pydoc.patch diff --git a/patches/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/patches/0015-Add-an-option-to-disable-lib2to3.patch similarity index 100% rename from patches/python3/0015-Add-an-option-to-disable-lib2to3.patch rename to package/python3/patches/0015-Add-an-option-to-disable-lib2to3.patch diff --git a/patches/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/patches/0016-Add-option-to-disable-the-sqlite3-module.patch similarity index 100% rename from patches/python3/0016-Add-option-to-disable-the-sqlite3-module.patch rename to package/python3/patches/0016-Add-option-to-disable-the-sqlite3-module.patch diff --git a/patches/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/patches/0017-Add-an-option-to-disable-the-tk-module.patch similarity index 100% rename from patches/python3/0017-Add-an-option-to-disable-the-tk-module.patch rename to package/python3/patches/0017-Add-an-option-to-disable-the-tk-module.patch diff --git a/patches/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/package/python3/patches/0018-Add-an-option-to-disable-the-curses-module.patch similarity index 100% rename from patches/python3/0018-Add-an-option-to-disable-the-curses-module.patch rename to package/python3/patches/0018-Add-an-option-to-disable-the-curses-module.patch diff --git a/patches/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/patches/0019-Add-an-option-to-disable-expat.patch similarity index 100% rename from patches/python3/0019-Add-an-option-to-disable-expat.patch rename to package/python3/patches/0019-Add-an-option-to-disable-expat.patch diff --git a/patches/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/patches/0020-Add-an-option-to-disable-CJK-codecs.patch similarity index 100% rename from patches/python3/0020-Add-an-option-to-disable-CJK-codecs.patch rename to package/python3/patches/0020-Add-an-option-to-disable-CJK-codecs.patch diff --git a/patches/python3/0021-Add-an-option-to-disable-NIS.patch b/package/python3/patches/0021-Add-an-option-to-disable-NIS.patch similarity index 100% rename from patches/python3/0021-Add-an-option-to-disable-NIS.patch rename to package/python3/patches/0021-Add-an-option-to-disable-NIS.patch diff --git a/patches/python3/0022-Add-an-option-to-disable-unicodedata.patch b/package/python3/patches/0022-Add-an-option-to-disable-unicodedata.patch similarity index 100% rename from patches/python3/0022-Add-an-option-to-disable-unicodedata.patch rename to package/python3/patches/0022-Add-an-option-to-disable-unicodedata.patch diff --git a/patches/python3/0023-Add-an-option-to-disable-IDLE.patch b/package/python3/patches/0023-Add-an-option-to-disable-IDLE.patch similarity index 100% rename from patches/python3/0023-Add-an-option-to-disable-IDLE.patch rename to package/python3/patches/0023-Add-an-option-to-disable-IDLE.patch diff --git a/patches/python3/0024-Add-an-option-to-disable-decimal.patch b/package/python3/patches/0024-Add-an-option-to-disable-decimal.patch similarity index 100% rename from patches/python3/0024-Add-an-option-to-disable-decimal.patch rename to package/python3/patches/0024-Add-an-option-to-disable-decimal.patch diff --git a/patches/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/patches/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch similarity index 100% rename from patches/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch rename to package/python3/patches/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch diff --git a/patches/python3/0026-Add-an-option-to-disable-openssl-support.patch b/package/python3/patches/0026-Add-an-option-to-disable-openssl-support.patch similarity index 100% rename from patches/python3/0026-Add-an-option-to-disable-openssl-support.patch rename to package/python3/patches/0026-Add-an-option-to-disable-openssl-support.patch diff --git a/patches/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/package/python3/patches/0027-Add-an-option-to-disable-the-readline-module.patch similarity index 100% rename from patches/python3/0027-Add-an-option-to-disable-the-readline-module.patch rename to package/python3/patches/0027-Add-an-option-to-disable-the-readline-module.patch diff --git a/patches/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/patches/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch similarity index 100% rename from patches/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch rename to package/python3/patches/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch diff --git a/patches/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/package/python3/patches/0029-python-config.sh-don-t-reassign-prefix.patch similarity index 100% rename from patches/python3/0029-python-config.sh-don-t-reassign-prefix.patch rename to package/python3/patches/0029-python-config.sh-don-t-reassign-prefix.patch diff --git a/patches/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/package/python3/patches/0030-Fix-cross-compiling-the-uuid-module.patch similarity index 100% rename from patches/python3/0030-Fix-cross-compiling-the-uuid-module.patch rename to package/python3/patches/0030-Fix-cross-compiling-the-uuid-module.patch diff --git a/patches/python3/0031-Add-an-option-to-disable-uuid-module.patch b/package/python3/patches/0031-Add-an-option-to-disable-uuid-module.patch similarity index 100% rename from patches/python3/0031-Add-an-option-to-disable-uuid-module.patch rename to package/python3/patches/0031-Add-an-option-to-disable-uuid-module.patch diff --git a/patches/python3/0032-fix-building-on-older-distributions.patch b/package/python3/patches/0032-fix-building-on-older-distributions.patch similarity index 100% rename from patches/python3/0032-fix-building-on-older-distributions.patch rename to package/python3/patches/0032-fix-building-on-older-distributions.patch diff --git a/patches/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/patches/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch similarity index 100% rename from patches/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch rename to package/python3/patches/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch diff --git a/patches/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/patches/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch similarity index 100% rename from patches/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch rename to package/python3/patches/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch diff --git a/patches/rpcbind-0001-Remove-yellow-pages-support.patch b/package/rpcbind/patches/rpcbind-0001-Remove-yellow-pages-support.patch similarity index 100% rename from patches/rpcbind-0001-Remove-yellow-pages-support.patch rename to package/rpcbind/patches/rpcbind-0001-Remove-yellow-pages-support.patch diff --git a/patches/rpcbind-0002-add_option_to_fix_port_number.patch b/package/rpcbind/patches/rpcbind-0002-add_option_to_fix_port_number.patch similarity index 100% rename from patches/rpcbind-0002-add_option_to_fix_port_number.patch rename to package/rpcbind/patches/rpcbind-0002-add_option_to_fix_port_number.patch diff --git a/patches/rtl8812au/0001-rt8812au-gcc5.patch b/package/rtl8812au/patches/0001-rt8812au-gcc5.patch similarity index 100% rename from patches/rtl8812au/0001-rt8812au-gcc5.patch rename to package/rtl8812au/patches/0001-rt8812au-gcc5.patch diff --git a/patches/rtl8812au/0002-rt8812au-Add-support-for-kernels-4.8.patch b/package/rtl8812au/patches/0002-rt8812au-Add-support-for-kernels-4.8.patch similarity index 100% rename from patches/rtl8812au/0002-rt8812au-Add-support-for-kernels-4.8.patch rename to package/rtl8812au/patches/0002-rt8812au-Add-support-for-kernels-4.8.patch diff --git a/patches/rtl8822bu/0001-add-linux-4.19-support.patch b/package/rtl8822bu/patches/0001-add-linux-4.19-support.patch similarity index 100% rename from patches/rtl8822bu/0001-add-linux-4.19-support.patch rename to package/rtl8822bu/patches/0001-add-linux-4.19-support.patch diff --git a/patches/rtl8822bu/0002-add-linux-4.20-support.patch b/package/rtl8822bu/patches/0002-add-linux-4.20-support.patch similarity index 100% rename from patches/rtl8822bu/0002-add-linux-4.20-support.patch rename to package/rtl8822bu/patches/0002-add-linux-4.20-support.patch diff --git a/patches/rtl8822bu/0003-add-linux-5.0-support.patch b/package/rtl8822bu/patches/0003-add-linux-5.0-support.patch similarity index 100% rename from patches/rtl8822bu/0003-add-linux-5.0-support.patch rename to package/rtl8822bu/patches/0003-add-linux-5.0-support.patch diff --git a/patches/rtl8822bu/0004-add-linux-5.1-support.patch b/package/rtl8822bu/patches/0004-add-linux-5.1-support.patch similarity index 100% rename from patches/rtl8822bu/0004-add-linux-5.1-support.patch rename to package/rtl8822bu/patches/0004-add-linux-5.1-support.patch diff --git a/patches/rtl8822bu/0005-add-linux-5.2-support.patch b/package/rtl8822bu/patches/0005-add-linux-5.2-support.patch similarity index 100% rename from patches/rtl8822bu/0005-add-linux-5.2-support.patch rename to package/rtl8822bu/patches/0005-add-linux-5.2-support.patch diff --git a/configs/samba33-config.site b/package/samba33/files/samba33-config.site similarity index 100% rename from configs/samba33-config.site rename to package/samba33/files/samba33-config.site diff --git a/patches/samba33-build-only-what-we-need.patch b/package/samba33/patches/samba33-build-only-what-we-need.patch similarity index 100% rename from patches/samba33-build-only-what-we-need.patch rename to package/samba33/patches/samba33-build-only-what-we-need.patch diff --git a/patches/samba33-configure.in-make-getgrouplist_ok-test-cross-compile.patch b/package/samba33/patches/samba33-configure.in-make-getgrouplist_ok-test-cross-compile.patch similarity index 100% rename from patches/samba33-configure.in-make-getgrouplist_ok-test-cross-compile.patch rename to package/samba33/patches/samba33-configure.in-make-getgrouplist_ok-test-cross-compile.patch diff --git a/configs/samba36-config.site b/package/samba36/files/samba36-config.site similarity index 100% rename from configs/samba36-config.site rename to package/samba36/files/samba36-config.site diff --git a/patches/samba36-CVE-2016-2112-v3-6.patch b/package/samba36/patches/samba36-CVE-2016-2112-v3-6.patch similarity index 91% rename from patches/samba36-CVE-2016-2112-v3-6.patch rename to package/samba36/patches/samba36-CVE-2016-2112-v3-6.patch index c408a301..78e0a669 100644 --- a/patches/samba36-CVE-2016-2112-v3-6.patch +++ b/package/samba36/patches/samba36-CVE-2016-2112-v3-6.patch @@ -10,8 +10,8 @@ Signed-off-by: Andreas Schneider source3/libsmb/ntlmssp.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) ---- source3/include/proto.h -+++ source3/include/proto.h +--- a/source3/include/proto.h ++++ b/source3/include/proto.h @@ -1260,6 +1260,7 @@ NTSTATUS ntlmssp_set_password(struct ntl NTSTATUS ntlmssp_set_domain(struct ntlmssp_state *ntlmssp_state, const char *domain) ; void ntlmssp_want_feature_list(struct ntlmssp_state *ntlmssp_state, char *feature_list); @@ -20,8 +20,8 @@ Signed-off-by: Andreas Schneider NTSTATUS ntlmssp_update(struct ntlmssp_state *ntlmssp_state, const DATA_BLOB in, DATA_BLOB *out) ; NTSTATUS ntlmssp_server_start(TALLOC_CTX *mem_ctx, ---- source3/libsmb/ntlmssp.c -+++ source3/libsmb/ntlmssp.c +--- a/source3/libsmb/ntlmssp.c ++++ b/source3/libsmb/ntlmssp.c @@ -162,6 +162,36 @@ NTSTATUS ntlmssp_set_domain(struct ntlms return NT_STATUS_OK; } @@ -59,8 +59,8 @@ Signed-off-by: Andreas Schneider /** * Request features for the NTLMSSP negotiation * ---- source3/libads/sasl.c -+++ source3/libads/sasl.c +--- a/source3/libads/sasl.c ++++ b/source3/libads/sasl.c @@ -261,6 +261,37 @@ static ADS_STATUS ads_sasl_spnego_ntlmss /* we have a reference conter on ntlmssp_state, if we are signing then the state will be kept by the signing engine */ @@ -99,8 +99,8 @@ Signed-off-by: Andreas Schneider if (ads->ldap.wrap_type > ADS_SASLWRAP_TYPE_PLAIN) { ads->ldap.out.max_unwrapped = ADS_SASL_WRAPPING_OUT_MAX_WRAPPED - NTLMSSP_SIG_SIZE; ads->ldap.out.sig_size = NTLMSSP_SIG_SIZE; ---- docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml -+++ docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml +--- a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml ++++ b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml @@ -34,11 +34,9 @@ @@ -116,8 +116,8 @@ Signed-off-by: Andreas Schneider -plain +sign ---- source3/param/loadparm.c -+++ source3/param/loadparm.c +--- a/source3/param/loadparm.c ++++ b/source3/param/loadparm.c @@ -5392,6 +5392,8 @@ static void init_globals(bool reinit_glo Globals.ldap_debug_level = 0; Globals.ldap_debug_threshold = 10; diff --git a/patches/samba36-CVE-2016-2115-v3-6.patch b/package/samba36/patches/samba36-CVE-2016-2115-v3-6.patch similarity index 94% rename from patches/samba36-CVE-2016-2115-v3-6.patch rename to package/samba36/patches/samba36-CVE-2016-2115-v3-6.patch index c2da4c2c..5618fb4e 100644 --- a/patches/samba36-CVE-2016-2115-v3-6.patch +++ b/package/samba36/patches/samba36-CVE-2016-2115-v3-6.patch @@ -16,7 +16,7 @@ Reviewed-by: Ralph Boehme create mode 100644 docs-xml/smbdotconf/security/clientipcsigning.xml --- /dev/null -+++ docs-xml/smbdotconf/security/clientipcsigning.xml ++++ b/docs-xml/smbdotconf/security/clientipcsigning.xml @@ -0,0 +1,23 @@ + + +mandatory + ---- docs-xml/smbdotconf/security/clientsigning.xml -+++ docs-xml/smbdotconf/security/clientsigning.xml +--- a/docs-xml/smbdotconf/security/clientsigning.xml ++++ b/docs-xml/smbdotconf/security/clientsigning.xml @@ -12,6 +12,9 @@ When set to auto, SMB signing is offered, but not enforced. When set to mandatory, SMB signing is required and if set @@ -53,8 +53,8 @@ Reviewed-by: Ralph Boehme ---- source3/include/proto.h -+++ source3/include/proto.h +--- a/source3/include/proto.h ++++ b/source3/include/proto.h @@ -1690,9 +1690,11 @@ int lp_winbind_cache_time(void); int lp_winbind_reconnect_delay(void); int lp_winbind_max_clients(void); @@ -67,8 +67,8 @@ Reviewed-by: Ralph Boehme int lp_server_signing(void); int lp_client_ldap_sasl_wrapping(void); char *lp_parm_talloc_string(int snum, const char *type, const char *option, const char *def); ---- source3/param/loadparm.c -+++ source3/param/loadparm.c +--- a/source3/param/loadparm.c ++++ b/source3/param/loadparm.c @@ -215,6 +215,7 @@ struct global { int winbind_expand_groups; bool bWinbindRefreshTickets; @@ -170,8 +170,8 @@ Reviewed-by: Ralph Boehme init_iconv(); bAllowIncludeRegistry = true; ---- source3/rpc_server/spoolss/srv_spoolss_nt.c -+++ source3/rpc_server/spoolss/srv_spoolss_nt.c +--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c ++++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -2480,7 +2480,7 @@ static bool spoolss_connect_to_client(st "", /* username */ "", /* domain */ @@ -182,7 +182,7 @@ Reviewed-by: Ralph Boehme if ( !NT_STATUS_IS_OK( ret ) ) { DEBUG(2,("spoolss_connect_to_client: connection to [%s] failed!\n", --- /dev/null -+++ docs-xml/smbdotconf/winbind/winbindsealedpipes.xml ++++ b/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml @@ -0,0 +1,15 @@ + + +yes + ---- source3/winbindd/winbindd_cm.c -+++ source3/winbindd/winbindd_cm.c +--- a/source3/winbindd/winbindd_cm.c ++++ b/source3/winbindd/winbindd_cm.c @@ -2384,6 +2384,15 @@ NTSTATUS cm_connect_sam(struct winbindd_ TALLOC_FREE(conn->samr_pipe); diff --git a/patches/samba36-CVE-2017-7494-v3-6.patch b/package/samba36/patches/samba36-CVE-2017-7494-v3-6.patch similarity index 91% rename from patches/samba36-CVE-2017-7494-v3-6.patch rename to package/samba36/patches/samba36-CVE-2017-7494-v3-6.patch index cc2aae9d..17b020d8 100644 --- a/patches/samba36-CVE-2017-7494-v3-6.patch +++ b/package/samba36/patches/samba36-CVE-2017-7494-v3-6.patch @@ -13,8 +13,8 @@ Reviewed-by: Stefan Metzmacher source3/rpc_server/srv_pipe.c | 5 +++++ 1 file changed, 5 insertions(+) ---- source3/rpc_server/srv_pipe.c -+++ source3/rpc_server/srv_pipe.c +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c @@ -473,6 +473,11 @@ bool is_known_pipename(const char *cli_f pipename += 1; } diff --git a/patches/samba36-build-only-what-we-need.patch b/package/samba36/patches/samba36-build-only-what-we-need.patch similarity index 100% rename from patches/samba36-build-only-what-we-need.patch rename to package/samba36/patches/samba36-build-only-what-we-need.patch diff --git a/patches/samba36-remove_ad_support.patch b/package/samba36/patches/samba36-remove_ad_support.patch similarity index 100% rename from patches/samba36-remove_ad_support.patch rename to package/samba36/patches/samba36-remove_ad_support.patch diff --git a/patches/samba36-remove_printer_support.patch b/package/samba36/patches/samba36-remove_printer_support.patch similarity index 100% rename from patches/samba36-remove_printer_support.patch rename to package/samba36/patches/samba36-remove_printer_support.patch diff --git a/patches/samba36-remove_registry_backend.patch b/package/samba36/patches/samba36-remove_registry_backend.patch similarity index 100% rename from patches/samba36-remove_registry_backend.patch rename to package/samba36/patches/samba36-remove_registry_backend.patch diff --git a/patches/samba36-remove_services.patch b/package/samba36/patches/samba36-remove_services.patch similarity index 100% rename from patches/samba36-remove_services.patch rename to package/samba36/patches/samba36-remove_services.patch diff --git a/patches/samba36-remove_winreg_support.patch b/package/samba36/patches/samba36-remove_winreg_support.patch similarity index 100% rename from patches/samba36-remove_winreg_support.patch rename to package/samba36/patches/samba36-remove_winreg_support.patch diff --git a/patches/samba36-strip_srvsvc.patch b/package/samba36/patches/samba36-strip_srvsvc.patch similarity index 100% rename from patches/samba36-strip_srvsvc.patch rename to package/samba36/patches/samba36-strip_srvsvc.patch diff --git a/patches/sysvinit/change-INIT_FIFO.patch b/package/sysvinit/patches/change-INIT_FIFO.patch similarity index 100% rename from patches/sysvinit/change-INIT_FIFO.patch rename to package/sysvinit/patches/change-INIT_FIFO.patch diff --git a/patches/sysvinit/crypt-lib.patch b/package/sysvinit/patches/crypt-lib.patch similarity index 100% rename from patches/sysvinit/crypt-lib.patch rename to package/sysvinit/patches/crypt-lib.patch diff --git a/patches/usbutils-avoid-dependency-on-bash.patch b/package/usbutils/patches/usbutils-avoid-dependency-on-bash.patch similarity index 100% rename from patches/usbutils-avoid-dependency-on-bash.patch rename to package/usbutils/patches/usbutils-avoid-dependency-on-bash.patch diff --git a/patches/usbutils-fix-null-pointer-crash.patch b/package/usbutils/patches/usbutils-fix-null-pointer-crash.patch similarity index 100% rename from patches/usbutils-fix-null-pointer-crash.patch rename to package/usbutils/patches/usbutils-fix-null-pointer-crash.patch diff --git a/patches/ushare-disable-iconv-check.patch b/package/ushare/patches/ushare-disable-iconv-check.patch similarity index 100% rename from patches/ushare-disable-iconv-check.patch rename to package/ushare/patches/ushare-disable-iconv-check.patch diff --git a/patches/ushare-fix-building-with-gcc-5.x.patch b/package/ushare/patches/ushare-fix-building-with-gcc-5.x.patch similarity index 100% rename from patches/ushare-fix-building-with-gcc-5.x.patch rename to package/ushare/patches/ushare-fix-building-with-gcc-5.x.patch diff --git a/patches/ushare.diff b/package/ushare/patches/ushare.diff similarity index 100% rename from patches/ushare.diff rename to package/ushare/patches/ushare.diff diff --git a/patches/valgrind-fix-build-armv7-a.patch b/package/valgrind/patches/valgrind-fix-build-armv7-a.patch similarity index 100% rename from patches/valgrind-fix-build-armv7-a.patch rename to package/valgrind/patches/valgrind-fix-build-armv7-a.patch diff --git a/patches/valgrind-fix-build-armv7ve.patch b/package/valgrind/patches/valgrind-fix-build-armv7ve.patch similarity index 100% rename from patches/valgrind-fix-build-armv7ve.patch rename to package/valgrind/patches/valgrind-fix-build-armv7ve.patch diff --git a/patches/vsftpd-disable-capabilities.patch b/package/vsftpd/patches/vsftpd-disable-capabilities.patch similarity index 100% rename from patches/vsftpd-disable-capabilities.patch rename to package/vsftpd/patches/vsftpd-disable-capabilities.patch diff --git a/patches/vsftpd-fix-CVE-2015-1419.patch b/package/vsftpd/patches/vsftpd-fix-CVE-2015-1419.patch similarity index 100% rename from patches/vsftpd-fix-CVE-2015-1419.patch rename to package/vsftpd/patches/vsftpd-fix-CVE-2015-1419.patch diff --git a/patches/vsftpd-fixchroot.patch b/package/vsftpd/patches/vsftpd-fixchroot.patch similarity index 100% rename from patches/vsftpd-fixchroot.patch rename to package/vsftpd/patches/vsftpd-fixchroot.patch diff --git a/patches/vsftpd-login-blank-password.patch b/package/vsftpd/patches/vsftpd-login-blank-password.patch similarity index 100% rename from patches/vsftpd-login-blank-password.patch rename to package/vsftpd/patches/vsftpd-login-blank-password.patch diff --git a/patches/wget/change_DEFAULT_LOGFILE.patch b/package/wget/patches/change_DEFAULT_LOGFILE.patch similarity index 100% rename from patches/wget/change_DEFAULT_LOGFILE.patch rename to package/wget/patches/change_DEFAULT_LOGFILE.patch diff --git a/patches/wget/set-check_cert-false-by-default.patch b/package/wget/patches/set-check_cert-false-by-default.patch similarity index 100% rename from patches/wget/set-check_cert-false-by-default.patch rename to package/wget/patches/set-check_cert-false-by-default.patch diff --git a/configs/wpa_supplicant.config b/package/wpa_supplicant/files/wpa_supplicant.config similarity index 100% rename from configs/wpa_supplicant.config rename to package/wpa_supplicant/files/wpa_supplicant.config diff --git a/patches/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch b/package/xfsprogs/patches/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch similarity index 100% rename from patches/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch rename to package/xfsprogs/patches/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch diff --git a/patches/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch b/package/xfsprogs/patches/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch similarity index 100% rename from patches/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch rename to package/xfsprogs/patches/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch diff --git a/patches/xupnpd-add-configuration-files.diff b/package/xupnpd/patches/xupnpd-add-configuration-files.diff similarity index 100% rename from patches/xupnpd-add-configuration-files.diff rename to package/xupnpd/patches/xupnpd-add-configuration-files.diff diff --git a/patches/xupnpd-dynamic-lua.patch b/package/xupnpd/patches/xupnpd-dynamic-lua.patch similarity index 100% rename from patches/xupnpd-dynamic-lua.patch rename to package/xupnpd/patches/xupnpd-dynamic-lua.patch diff --git a/patches/xupnpd-fix-memleak.patch b/package/xupnpd/patches/xupnpd-fix-memleak.patch similarity index 100% rename from patches/xupnpd-fix-memleak.patch rename to package/xupnpd/patches/xupnpd-fix-memleak.patch diff --git a/patches/xupnpd-fix-webif-backlinks.diff b/package/xupnpd/patches/xupnpd-fix-webif-backlinks.diff similarity index 100% rename from patches/xupnpd-fix-webif-backlinks.diff rename to package/xupnpd/patches/xupnpd-fix-webif-backlinks.diff diff --git a/package/zic/patches/0001-remove-dependency-check-on-version-file.patch b/package/zic/patches/0001-remove-dependency-check-on-version-file.patch new file mode 100644 index 00000000..193c2630 --- /dev/null +++ b/package/zic/patches/0001-remove-dependency-check-on-version-file.patch @@ -0,0 +1,32 @@ +From 4ad8932f93c490d15586b1def3863e9580e6eceb Mon Sep 17 00:00:00 2001 +From: Martin Bark +Date: Sat, 3 Dec 2016 13:51:50 +0000 +Subject: [PATCH] remove dependency check on version file + +$(VERSION_DEPS) includes dependencies from tzdata meaning applications +such as zic can't build from tzcode on their own. Remove the dependency +to $(VERSION_DEPS) since it is not necessary to check for version updates +in released code. This solves building zic from tzcode without needing +tzdata. + +Signed-off-by: Martin Bark +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1b714a8..00d2c09 100644 +--- a/Makefile ++++ b/Makefile +@@ -587,7 +587,7 @@ INSTALL: ALL install date.1 + # Otherwise, use $(VERSION) unless it is "unknown" and there is already + # a 'version' file, in which case reuse the existing 'version' contents + # and append "-dirty" if the contents do not already end in "-dirty". +-version: $(VERSION_DEPS) ++version: + { (type git) >/dev/null 2>&1 && \ + V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ + --abbrev=7 --dirty` || \ +-- +2.7.4 + diff --git a/patches/zlib-ldflags-tests.patch b/package/zlib/patches/zlib-ldflags-tests.patch similarity index 100% rename from patches/zlib-ldflags-tests.patch rename to package/zlib/patches/zlib-ldflags-tests.patch diff --git a/patches/zlib-remove.ldconfig.call.patch b/package/zlib/patches/zlib-remove.ldconfig.call.patch similarity index 100% rename from patches/zlib-remove.ldconfig.call.patch rename to package/zlib/patches/zlib-remove.ldconfig.call.patch diff --git a/patches/Python-xcompile.patch b/patches/Python-xcompile.patch deleted file mode 100644 index 2da552f1..00000000 --- a/patches/Python-xcompile.patch +++ /dev/null @@ -1,264 +0,0 @@ -diff -ur Python-2.7.3.orig/configure Python-2.7.3-Source/configure ---- Python-2.7.3.orig/configure 2012-04-09 19:07:36.000000000 -0400 -+++ Python-2.7.3-Source/configure 2012-10-23 14:10:45.305220393 -0400 -@@ -13697,7 +13697,7 @@ - $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then : -- ac_cv_have_long_long_format=no -+ ac_cv_have_long_long_format="cross -- assuming yes" - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -13749,7 +13749,7 @@ - $as_echo "$ac_cv_have_long_long_format" >&6; } - fi - --if test "$ac_cv_have_long_long_format" = yes -+if test "$ac_cv_have_long_long_format" != no - then - - $as_echo "#define PY_FORMAT_LONG_LONG \"ll\"" >>confdefs.h -diff -ur Python-2.7.3.orig/Makefile.pre.in Python-2.7.3-Source/Makefile.pre.in ---- Python-2.7.3.orig/Makefile.pre.in 2012-04-09 19:07:33.000000000 -0400 -+++ Python-2.7.3-Source/Makefile.pre.in 2012-10-23 14:10:45.305220393 -0400 -@@ -182,6 +182,7 @@ - - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) -+HOSTPYTHON= ./$(BUILDPYTHON) - - # The task to run while instrument when building the profile-opt target - PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck -@@ -215,6 +216,8 @@ - # Parser - PGEN= Parser/pgen$(EXE) - -+HOSTPGEN= $(PGEN) -+ - POBJS= \ - Parser/acceler.o \ - Parser/grammar1.o \ -@@ -408,8 +411,8 @@ - # Build the shared modules - sharedmods: $(BUILDPYTHON) - @case $$MAKEFLAGS in \ -- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ -- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ -+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' PYTHONXCPREFIX='$(DESTDIR)$(prefix)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ -+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' PYTHONXCPREFIX='$(DESTDIR)$(prefix)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ - esac - - # Build static library -@@ -543,7 +546,7 @@ - $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp - Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT) - -@$(INSTALL) -d Include -- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - -touch Parser/pgen.stamp - - $(PGEN): $(PGENOBJS) -@@ -938,26 +941,26 @@ - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ ./$(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ ./$(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -+ ./$(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ ./$(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" -+ ./$(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" - - # Create the PLATDIR source directory, if one wasn't distributed.. - $(srcdir)/Lib/$(PLATDIR): -@@ -1062,7 +1065,9 @@ - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: sharedmods -- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ -+ CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ -+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ -+ --skip-build \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -diff -ur Python-2.7.3.orig/setup.py Python-2.7.3-Source/setup.py ---- Python-2.7.3.orig/setup.py 2012-04-09 19:07:36.000000000 -0400 -+++ Python-2.7.3-Source/setup.py 2012-10-23 14:10:56.085220237 -0400 -@@ -145,6 +145,7 @@ - def __init__(self, dist): - build_ext.__init__(self, dist) - self.failed = [] -+ self.cross_compile = os.environ.get('CROSS_COMPILE_TARGET') == 'yes' - - def build_extensions(self): - -@@ -278,6 +279,14 @@ - (ext.name, sys.exc_info()[1])) - self.failed.append(ext.name) - return -+ -+ # Import check will not work when cross-compiling. -+ if os.environ.has_key('PYTHONXCPREFIX'): -+ self.announce( -+ 'WARNING: skipping import check for cross-compiled: "%s"' % -+ ext.name) -+ return -+ - # Workaround for Mac OS X: The Carbon-based modules cannot be - # reliably imported into a command-line Python - if 'Carbon' in ext.extra_link_args: -@@ -369,9 +378,10 @@ - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -- self.add_multiarch_paths() -+ if not self.cross_compile: -+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ self.add_multiarch_paths() - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -408,7 +418,8 @@ - add_dir_to_list(dir_list, directory) - - if os.path.normpath(sys.prefix) != '/usr' \ -- and not sysconfig.get_config_var('PYTHONFRAMEWORK'): -+ and not sysconfig.get_config_var('PYTHONFRAMEWORK') \ -+ and not self.cross_compile: - # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework - # (PYTHONFRAMEWORK is set) to avoid # linking problems when - # building a framework with different architectures than -@@ -426,11 +437,23 @@ - # lib_dirs and inc_dirs are used to search for files; - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. -- lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -- '/lib', '/usr/lib', -- ] -- inc_dirs = self.compiler.include_dirs + ['/usr/include'] -+ lib_dirs = self.compiler.library_dirs -+ inc_dirs = self.compiler.include_dirs -+ if not self.cross_compile: -+ lib_dirs += [ -+ '/lib64', '/usr/lib64', -+ '/lib', '/usr/lib', -+ ] -+ inc_dirs += ['/usr/include'] -+ else: -+ # The common install prefix of 3rd party libraries used during -+ # cross compilation -+ mydir = os.environ.get('PYTHON_XCOMPILE_DEPENDENCIES_PREFIX') -+ if mydir: -+ inc_dirs += [mydir + '/include' ] -+ inc_dirs += [mydir + '/lib/libffi-3.0.10/include'] -+ lib_dirs += [mydir + '/lib' ] -+ - exts = [] - missing = [] - -@@ -1004,13 +1027,24 @@ - # We hunt for #define SQLITE_VERSION "n.n.n" - # We need to find >= sqlite version 3.0.8 - sqlite_incdir = sqlite_libdir = None -- sqlite_inc_paths = [ '/usr/include', -- '/usr/include/sqlite', -- '/usr/include/sqlite3', -- '/usr/local/include', -- '/usr/local/include/sqlite', -- '/usr/local/include/sqlite3', -- ] -+ -+ if not self.cross_compile: -+ sqlite_inc_paths = [ '/usr/include', -+ '/usr/include/sqlite', -+ '/usr/include/sqlite3', -+ '/usr/local/include', -+ '/usr/local/include/sqlite', -+ '/usr/local/include/sqlite3', -+ ] -+ else: -+ # The common install prefix of 3rd party headers used during -+ # cross compilation -+ mydir = os.environ.get('PYTHON_XCOMPILE_DEPENDENCIES_PREFIX') -+ if mydir: -+ sqlite_inc_paths = [mydir + '/include' ] -+ else: -+ sqlite_inc_paths = [] -+ - MIN_SQLITE_VERSION_NUMBER = (3, 0, 8) - MIN_SQLITE_VERSION = ".".join([str(x) - for x in MIN_SQLITE_VERSION_NUMBER]) -@@ -1050,12 +1084,22 @@ - print "sqlite: %s had no SQLITE_VERSION"%(f,) - - if sqlite_incdir: -- sqlite_dirs_to_check = [ -- os.path.join(sqlite_incdir, '..', 'lib64'), -- os.path.join(sqlite_incdir, '..', 'lib'), -- os.path.join(sqlite_incdir, '..', '..', 'lib64'), -- os.path.join(sqlite_incdir, '..', '..', 'lib'), -- ] -+ if not self.cross_compile: -+ sqlite_dirs_to_check = [ -+ os.path.join(sqlite_incdir, '..', 'lib64'), -+ os.path.join(sqlite_incdir, '..', 'lib'), -+ os.path.join(sqlite_incdir, '..', '..', 'lib64'), -+ os.path.join(sqlite_incdir, '..', '..', 'lib'), -+ ] -+ else: -+ # The common install prefix of 3rd party headers used during -+ # cross compilation -+ mydir = os.environ.get('PYTHON_XCOMPILE_DEPENDENCIES_PREFIX') -+ if mydir: -+ sqlite_dirs_to_check = [mydir + '/lib' ] -+ else: -+ sqlite_dirs_to_check = [] -+ - sqlite_libfile = self.compiler.find_library_file( - sqlite_dirs_to_check + lib_dirs, 'sqlite3') - if sqlite_libfile: -@@ -1864,8 +1908,15 @@ - - # Pass empty CFLAGS because we'll just append the resulting - # CFLAGS to Python's; -g or -O2 is to be avoided. -- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ -- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) -+ if self.cross_compile: -+ cmd = "cd %s && env CFLAGS='' %s/configure --host=%s --build=%s %s" \ -+ % (ffi_builddir, ffi_srcdir, -+ os.environ.get('HOSTARCH'), -+ os.environ.get('BUILDARCH'), -+ " ".join(config_args)) -+ else: -+ cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ -+ % (ffi_builddir, ffi_srcdir, " ".join(config_args)) - - res = os.system(cmd) - if res or not os.path.exists(ffi_configfile): diff --git a/patches/parted-device-mapper.patch b/patches/parted-device-mapper.patch deleted file mode 100644 index fc50221b..00000000 --- a/patches/parted-device-mapper.patch +++ /dev/null @@ -1,69 +0,0 @@ -Submitted By: Ken Moffat -Date: 2014-08-16 -Initial Package Version: 3.2 -Upstream Status: Unknown -Origin: Funtoo Linux -URL: http://data.gpo.zugaina.org/funtoo/sys-block/parted/files/parted-3.2-devmapper.patch -Description: Parted-3.2 fails to build with --disable-device-mapper - - ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -2304,6 +2304,7 @@ - return r < 0 ? NULL : resultp; - } - -+#ifdef ENABLE_DEVICE_MAPPER - static char * - dm_canonical_path (PedDevice const *dev) - { -@@ -2326,12 +2327,22 @@ - err: - return NULL; - } -+#endif /* ENABLE_DEVICE_MAPPER */ - - static char* - _device_get_part_path (PedDevice const *dev, int num) - { -- char *devpath = (dev->type == PED_DEVICE_DM -- ? dm_canonical_path (dev) : dev->path); -+ char *devpath = -+#ifdef ENABLE_DEVICE_MAPPER -+ ( -+ dev->type == PED_DEVICE_DM -+ ? dm_canonical_path (dev) : -+#endif /* ENABLE_DEVICE_MAPPER */ -+ dev->path -+#ifdef ENABLE_DEVICE_MAPPER -+ ) -+#endif /* ENABLE_DEVICE_MAPPER */ -+ ; - size_t path_len = strlen (devpath); - char *result; - /* Check for devfs-style /disc => /partN transformation -@@ -2945,12 +2956,14 @@ - unsigned long long *length); - - -+#ifdef ENABLE_DEVICE_MAPPER - if (disk->dev->type == PED_DEVICE_DM) { - add_partition = _dm_add_partition; - remove_partition = _dm_remove_partition; - resize_partition = _dm_resize_partition; - get_partition_start_and_length = _dm_get_partition_start_and_length; - } else { -+#endif /* ENABLE_DEVICE_MAPPER */ - add_partition = _blkpg_add_partition; - remove_partition = _blkpg_remove_partition; - #ifdef BLKPG_RESIZE_PARTITION -@@ -2959,7 +2972,9 @@ - resize_partition = NULL; - #endif - get_partition_start_and_length = _kernel_get_partition_start_and_length; -+#ifdef ENABLE_DEVICE_MAPPER - } -+#endif /* ENABLE_DEVICE_MAPPER */ - - /* lpn = largest partition number. - * for remove pass, use greater of device or label limit */ diff --git a/patches/parted-iconv.patch b/patches/parted-iconv.patch deleted file mode 100644 index aae6a135..00000000 --- a/patches/parted-iconv.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -288,6 +288,8 @@ fi - AC_PROG_LIBTOOL - LT_INIT - -+AM_ICONV -+ - AM_GNU_GETTEXT_VERSION([0.18]) - AM_GNU_GETTEXT([external]) - if test "$USE_INCLUDED_LIBINTL" = "yes"; then ---- a/parted/Makefile.am -+++ b/parted/Makefile.am -@@ -41,7 +41,8 @@ parted_LDADD = \ - libver.a \ - $(top_builddir)/libparted/libparted.la \ - $(INTLLIBS) $(LIBS) \ -- $(PARTED_LIBS) -+ $(PARTED_LIBS) \ -+ $(LIBICONV) - - parted_LDFLAGS = $(PARTEDLDFLAGS) - ---- a/partprobe/Makefile.am -+++ b/partprobe/Makefile.am -@@ -9,7 +9,8 @@ partprobe_SOURCES = partprobe.c - partprobe_LDADD = \ - $(top_builddir)/libparted/libparted.la \ - $(INTLLIBS) $(LIBS) \ -- $(PARTED_LIBS) -+ $(PARTED_LIBS) \ -+ $(LIBICONV) - - partprobe_LDFLAGS = $(PARTEDLDFLAGS) - ---- a/libparted/labels/Makefile.am -+++ b/libparted/labels/Makefile.am -@@ -35,7 +35,7 @@ liblabels_la_SOURCES = \ - rdb.c \ - sun.c - --liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) -+liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) $(LIBICONV) - - AM_CPPFLAGS = $(partedincludedir) $(INTLINCS) - diff --git a/patches/parted-sysmacros.patch b/patches/parted-sysmacros.patch deleted file mode 100644 index 211e6c73..00000000 --- a/patches/parted-sysmacros.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/580022 - -From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Tue, 21 Jun 2016 15:01:08 -0400 -Subject: [PATCH] include sysmacros.h for major/minor/makedev - -Linux C libs are moving away from including this header implicitly via -sys/types.h, so include it explicitly. - -Upstream-Status: Pending -Signed-off-by: Martin Jansa - ---- - libparted/arch/linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 326b95619d31..e5c168be3c68 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - #include /* for uname() */ - #include --- -2.8.2 - diff --git a/patches/valgrind12305-automake-1.11.2.patch b/patches/valgrind12305-automake-1.11.2.patch deleted file mode 100644 index a0b64c37..00000000 --- a/patches/valgrind12305-automake-1.11.2.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Fix errors with automake 1.11.2: `pkglibdir' is not a legitimate directory for `DATA' -Author: Gregorio Guidi -Origin: https://bugs.kde.org/show_bug.cgi?id=290719#c3 - -diff -Nur valgrind-3.7.0.orig/coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am ---- valgrind-3.7.0.orig/coregrind/Makefile.am -+++ valgrind-3.7.0/coregrind/Makefile.am -@@ -495,7 +495,8 @@ - m_gdbserver/powerpc-altivec64l.xml - - # so as to make sure these get copied into the install tree --pkglib_DATA = $(GDBSERVER_XML_FILES) -+vgdatadir = $(pkglibdir) -+vgdata_DATA = $(GDBSERVER_XML_FILES) - - # so as to make sure these get copied into the tarball - EXTRA_DIST += $(GDBSERVER_XML_FILES) -diff -Nur valgrind-3.7.0.orig/Makefile.am valgrind-3.7.0/Makefile.am ---- valgrind-3.7.0.orig/Makefile.am -+++ valgrind-3.7.0/Makefile.am -@@ -61,7 +61,8 @@ - # default.supp, as it is built from the base .supp files at compile-time. - dist_noinst_DATA = $(SUPP_FILES) - --pkglib_DATA = default.supp -+vgdatadir = $(pkglibdir) -+vgdata_DATA = default.supp - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = valgrind.pc diff --git a/patches/valgrind12305-nevis-patch.diff b/patches/valgrind12305-nevis-patch.diff deleted file mode 100644 index 50d062c2..00000000 --- a/patches/valgrind12305-nevis-patch.diff +++ /dev/null @@ -1,456 +0,0 @@ -Index: valgrind12305/configure.in -=================================================================== ---- valgrind12305/configure.in (revision 12305) -+++ valgrind12305/configure.in (working copy) -@@ -143,6 +143,8 @@ - # configure-time, and distinguishes them from the VGA_*/VGO_*/VGP_* - # variables used when compiling C files. - -+VGCONF_PLATFORM_ARM_ARCH= -+ - AC_CANONICAL_HOST - - AC_MSG_CHECKING([for a supported CPU]) -@@ -179,15 +181,34 @@ - ;; - - armv7*) -- AC_MSG_RESULT([ok (${host_cpu})]) -- ARCH_MAX="arm" -- ;; -+ # This means we use a armv7 toolchain - at least Cortex-A8 -+ AC_MSG_RESULT([ok (${host_cpu})]) -+ ARCH_MAX="arm" -+ VGCONF_PLATFORM_ARM_ARCH="-march=armv7 -mcpu=cortex-a8" -+ AC_DEFINE(ARM_ARCH_V7,1,"Defined for v7 architectures") -+ ;; - -+ armv6*) -+ AC_MSG_RESULT([ok (${host_cpu})]) -+ ARCH_MAX="arm" -+ VGCONF_PLATFORM_ARM_ARCH="-march=armv6" -+ AC_DEFINE(ARM_ARCH_V6,1,"Defined for v6 architectures") -+ ;; -+ -+ arm*) -+ # Generic arm toolchain - we will target armv5te -+ AC_MSG_RESULT([(${host_cpu}) - will enforce armv5te when compiling]) -+ ARCH_MAX="arm" -+ VGCONF_PLATFORM_ARM_ARCH="-march=armv5te" -+ AC_DEFINE(ARM_ARCH_V5TE,1,"Defined for v5te architectures") -+ ;; -+ - *) - AC_MSG_RESULT([no (${host_cpu})]) - AC_MSG_ERROR([Unsupported host architecture. Sorry]) - ;; - esac -+AC_SUBST(VGCONF_PLATFORM_ARM_ARCH) - - #---------------------------------------------------------------------------- - -Index: valgrind12305/Makefile.am -=================================================================== ---- valgrind12305/Makefile.am (revision 12305) -+++ valgrind12305/Makefile.am (working copy) -@@ -3,18 +3,19 @@ - - include $(top_srcdir)/Makefile.all.am - --TOOLS = memcheck \ -- cachegrind \ -- callgrind \ -- massif \ -- lackey \ -- none \ -- helgrind \ -- drd -+TOOLS = memcheck -+# jfr cachegrind \ -+# jfr callgrind \ -+# jfr massif \ -+# jfr lackey \ -+# jfr none \ -+# jfr helgrind \ -+# jfr drd - --EXP_TOOLS = exp-sgcheck \ -- exp-bbv \ -- exp-dhat -+EXP_TOOLS = -+# jfr exp-sgcheck \ -+# jfr exp-bbv \ -+# jfr exp-dhat - - # Put docs last because building the HTML is slow and we want to get - # everything else working before we try it. -@@ -28,9 +29,9 @@ - tests \ - perf \ - gdbserver_tests \ -- auxprogs \ -- mpi \ -- docs -+ auxprogs -+# jfr mpi \ -+# jfr docs - DIST_SUBDIRS = $(SUBDIRS) - - SUPP_FILES = \ -Index: valgrind12305/coregrind/pub_core_transtab_asm.h -=================================================================== ---- valgrind12305/coregrind/pub_core_transtab_asm.h (revision 12305) -+++ valgrind12305/coregrind/pub_core_transtab_asm.h (working copy) -@@ -58,12 +58,16 @@ - #if defined(VGA_x86) || defined(VGA_amd64) - # define VG_TT_FAST_HASH(_addr) ((((UWord)(_addr)) ) & VG_TT_FAST_MASK) - --#elif defined(VGA_s390x) || defined(VGA_arm) -+#elif defined(VGA_s390x) - # define VG_TT_FAST_HASH(_addr) ((((UWord)(_addr)) >> 1) & VG_TT_FAST_MASK) - - #elif defined(VGA_ppc32) || defined(VGA_ppc64) - # define VG_TT_FAST_HASH(_addr) ((((UWord)(_addr)) >> 2) & VG_TT_FAST_MASK) - -+#elif defined(VGA_arm) -+# define VG_TT_FAST_HASH(_addr) ((((UWord)(_addr)) >> (2- (1& _addr))) & VG_TT_FAST_MASK) -+ /* shift by 2 if ARM mode, by 1 if Thumb mode */ -+ - #else - # error "VG_TT_FAST_HASH: unknown platform" - #endif -Index: valgrind12305/coregrind/m_syswrap/syswrap-generic.c -=================================================================== ---- valgrind12305/coregrind/m_syswrap/syswrap-generic.c (revision 12305) -+++ valgrind12305/coregrind/m_syswrap/syswrap-generic.c (working copy) -@@ -2025,8 +2025,19 @@ - mreq.rkind = MAny; - } - -+ /* handle alignment to 4 pages we need for MAP_FIXED to succeed on ARM */ -+ vg_assert(VKI_SHMLBA >= VKI_PAGE_SIZE); -+ if ( (arg4 & VKI_MAP_SHARED) && (arg1 == 0) && (VKI_SHMLBA > VKI_PAGE_SIZE) ) { -+ mreq.len += VKI_SHMLBA - VKI_PAGE_SIZE; -+ } - /* Enquire ... */ - advised = VG_(am_get_advisory)( &mreq, True/*client*/, &mreq_ok ); -+ if (mreq_ok && (arg4 & VKI_MAP_SHARED) && (arg1 == 0) && (VKI_SHMLBA > VKI_PAGE_SIZE) ) { -+ Addr newaddr = VG_ROUNDUP(advised, VKI_SHMLBA); -+ mreq.len -= (newaddr - advised); -+ advised = newaddr; -+ } -+ - if (!mreq_ok) { - /* Our request was bounced, so we'd better fail. */ - return VG_(mk_SysRes_Error)( VKI_EINVAL ); -Index: valgrind12305/coregrind/m_dispatch/dispatch-arm-linux.S -=================================================================== ---- valgrind12305/coregrind/m_dispatch/dispatch-arm-linux.S (revision 12305) -+++ valgrind12305/coregrind/m_dispatch/dispatch-arm-linux.S (working copy) -@@ -9,6 +9,9 @@ - - Copyright (C) 2008-2011 Evan Geller - gaze@bea.ms -+ Copyright (C) 2011 John Reiser -+ jreiser@BitWagon.com -+ Sept+Oct 2011: Inner loops recoded for speed. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as -@@ -58,139 +61,134 @@ - - /* set FPSCR to vex-required default value */ - mov r4, #0 -- fmxr fpscr, r4 -+ /* fmxr fpscr, r4 */ - - /* r0 (hence also [sp,#0]) holds guest_state */ - /* r1 holds do_profiling */ - mov r8, r0 - ldr r0, [r8, #OFFSET_arm_R15T] -- -+ - /* fall into main loop (the right one) */ - cmp r1, #0 /* do_profiling */ -- beq VG_(run_innerloop__dispatch_unprofiled) -- b VG_(run_innerloop__dispatch_profiled) -+ bne VG_(run_innerloop__dispatch_profiled) -+ // FALLTHROUGH b VG_(run_innerloop__dispatch_unprofiled) - - - /*----------------------------------------------------*/ - /*--- NO-PROFILING (standard) dispatcher ---*/ - /*----------------------------------------------------*/ - --/* Pairing of insns below is my guesstimate of how dual dispatch would -- work on an A8. JRS, 2011-May-28 */ -+// Pairing of insns below is how dual dispatch should work. - -+CLR_HI= 32 - VG_TT_FAST_BITS -+CLR_LO= 32 - VG_TT_FAST_BITS -+ - .global VG_(run_innerloop__dispatch_unprofiled) - VG_(run_innerloop__dispatch_unprofiled): -- - /* AT ENTRY: r0 is next guest addr, r8 is possibly - modified guest state ptr */ - -- /* Has the guest state pointer been messed with? If yes, exit. */ -- movw r3, #:lower16:VG_(dispatch_ctr) - tst r8, #1 -+ ldr r2,=VG_(dispatch_ctr) - -- movt r3, #:upper16:VG_(dispatch_ctr) -+ bne gsp_changed // guest state pointer was modified -+ movs r3, r0, LSR #1 // shift off Thumb mode bit; set Carry - -- bne gsp_changed -+ ldr r5,=VG_(tt_fast) -+ movcc r3, r3, LSR #1 // if ARM mode then shift off another bit - -- /* save the jump address in the guest state */ -- str r0, [r8, #OFFSET_arm_R15T] -+ ldr r1, [r2] // dispatch_ctr -+ mov r3, r3, LSL #CLR_HI // shift off hi bits - -- /* Are we out of timeslice? If yes, defer to scheduler. */ -- ldr r2, [r3] -+ str r0, [r8, #OFFSET_arm_R15T] // save jump address into guest state -+ add r5, r5, r3, LSR #CLR_LO -3 // r5= &tt_fast[entry#] - -- subs r2, r2, #1 -+ ldr r4, [r5, #0] // r4= .guest -+ subs r1, r1, #1 // decrement timeslice - -- str r2, [r3] -+ ldr r5, [r5, #4] // r5= .host -+ beq counter_is_zero // out of timeslice ==> defer to scheduler - -- beq counter_is_zero -+ adr lr, VG_(run_innerloop__dispatch_unprofiled) // &continuation -+ cmp r4, r0 // check cache tag - -- /* try a fast lookup in the translation cache */ -- // r0 = next guest, r1,r2,r3,r4 scratch -- movw r1, #VG_TT_FAST_MASK // r1 = VG_TT_FAST_MASK -- movw r4, #:lower16:VG_(tt_fast) -- -- and r2, r1, r0, LSR #1 // r2 = entry # -- movt r4, #:upper16:VG_(tt_fast) // r4 = &VG_(tt_fast) -- -- add r1, r4, r2, LSL #3 // r1 = &tt_fast[entry#] -- -- ldrd r4, r5, [r1, #0] // r4 = .guest, r5 = .host -- -- cmp r4, r0 -- -- bne fast_lookup_failed -+ streq r1, [r2] // match: update dispatch_ctr -+ bxeq r5 // match: jump to .host, continue at *lr - // r5: next-host r8: live, gsp - // r4: next-guest -- // r2: entry # -+ // r2: &VG_(dispatch_ctr) -+ // r1: VG_(dispatch_ctr) - // LIVE: r5, r8; all others dead -- -- /* Found a match. Jump to .host. */ -- blx r5 -- b VG_(run_innerloop__dispatch_unprofiled) --.ltorg -+fast_lookup_failed: -+ movne r0, #VG_TRC_INNER_FASTMISS -+counter_is_zero: -+ moveq r0, #VG_TRC_INNER_COUNTERZERO -+ -+/* All exits from the dispatcher go through here. %r0 holds -+ the return value. -+*/ -+run_innerloop_exit: -+ /* We're leaving. Check that nobody messed with -+ FPSCR in ways we don't expect. */ -+ /* fmrx r4, fpscr */ -+ bic r4, #0xF8000000 /* mask out NZCV and QC */ -+ bic r4, #0x0000009F /* mask out IDC,IXC,UFC,OFC,DZC,IOC */ -+ cmp r4, #0 -+invariant_violation: -+ movne r0, #VG_TRC_INVARIANT_FAILED -+ -+run_innerloop_exit_REALLY: -+ add sp, sp, #8 -+ pop {r4, r5, r6, r7, r8, r9, fp, pc} - /*NOTREACHED*/ - -+.ltorg -+ - /*----------------------------------------------------*/ - /*--- PROFILING dispatcher (can be much slower) ---*/ - /*----------------------------------------------------*/ - - .global VG_(run_innerloop__dispatch_profiled) - VG_(run_innerloop__dispatch_profiled): -- - /* AT ENTRY: r0 is next guest addr, r8 is possibly - modified guest state ptr */ - -- /* Has the guest state pointer been messed with? If yes, exit. */ -- movw r3, #:lower16:VG_(dispatch_ctr) -- tst r8, #1 -+ tst r8, #1 -+ ldr r2,=VG_(dispatch_ctr) - -- movt r3, #:upper16:VG_(dispatch_ctr) -+ bne gsp_changed // guest state pointer was modified -+ movs r3, r0, LSR #1 // shift off Thumb mode bit; set Carry - -- bne gsp_changed -+ ldr r5,=VG_(tt_fast) -+ movcc r3, r3, LSR #1 // if ARM mode then shift off another bit - -- /* save the jump address in the guest state */ -- str r0, [r8, #OFFSET_arm_R15T] -+ ldr r1, [r2] // dispatch_ctr -+ mov r3, r3, LSL #CLR_HI // shift off hi bits - -- /* Are we out of timeslice? If yes, defer to scheduler. */ -- ldr r2, [r3] -+ str r0, [r8, #OFFSET_arm_R15T] // save jump address into guest state -+ add r5, r5, r3, LSR #CLR_LO -3 // r5= &tt_fast[entry#] - -- subs r2, r2, #1 -+ ldr r4, [r5, #0] // r4= .guest -+ subs r1, r1, #1 // decrement timeslice - -- str r2, [r3] -+ ldr r5, [r5, #4] // r5= .host -+ beq counter_is_zero // out of timeslice ==> defer to scheduler - -- beq counter_is_zero -+ cmp r4, r0 // check cache tag -+ ldr r0, =VG_(tt_fastN) - -- /* try a fast lookup in the translation cache */ -- // r0 = next guest, r1,r2,r3,r4 scratch -- movw r1, #VG_TT_FAST_MASK // r1 = VG_TT_FAST_MASK -- movw r4, #:lower16:VG_(tt_fast) -+ streq r1, [r2] // match: update dispatch_ctr -+ bne fast_lookup_failed - -- and r2, r1, r0, LSR #1 // r2 = entry # -- movt r4, #:upper16:VG_(tt_fast) // r4 = &VG_(tt_fast) -+ ldr r0, [r0, r3, LSR #CLR_LO -2] // tt_fastN[entry#] -+ adr lr, VG_(run_innerloop__dispatch_profiled) // &continuation -+// r0 stall -+ ldr r3, [r0] -+// r3 stall -+ add r3, r3, #1 - -- add r1, r4, r2, LSL #3 // r1 = &tt_fast[entry#] -- -- ldrd r4, r5, [r1, #0] // r4 = .guest, r5 = .host -- -- cmp r4, r0 -- -- bne fast_lookup_failed -- // r5: next-host r8: live, gsp -- // r4: next-guest -- // r2: entry # -- // LIVE: r5, r8; all others dead -- -- /* increment bb profile counter */ -- movw r0, #:lower16:VG_(tt_fastN) -- movt r0, #:upper16:VG_(tt_fastN) // r0 = &tt_fastN[0] -- ldr r0, [r0, r2, LSL #2] // r0 = tt_fast[entry #] -- ldr r3, [r0] // *r0 ++ -- add r3, r3, #1 -- str r3, [r0] -- -- /* Found a match. Jump to .host. */ -- blx r5 -- b VG_(run_innerloop__dispatch_profiled) -+ str r3, [r0] -+ bx r5 // match: jump to .host, continue at *lr - /*NOTREACHED*/ - - /*----------------------------------------------------*/ -@@ -212,49 +210,6 @@ - b run_innerloop_exit - /*NOTREACHED*/ - --counter_is_zero: -- /* R15T is up to date here */ -- /* Back out increment of the dispatch ctr */ -- ldr r1, =VG_(dispatch_ctr) -- ldr r2, [r1] -- add r2, r2, #1 -- str r2, [r1] -- mov r0, #VG_TRC_INNER_COUNTERZERO -- b run_innerloop_exit -- /*NOTREACHED*/ -- --fast_lookup_failed: -- /* R15T is up to date here */ -- /* Back out increment of the dispatch ctr */ -- ldr r1, =VG_(dispatch_ctr) -- ldr r2, [r1] -- add r2, r2, #1 -- str r2, [r1] -- mov r0, #VG_TRC_INNER_FASTMISS -- b run_innerloop_exit -- /*NOTREACHED*/ -- --/* All exits from the dispatcher go through here. %r0 holds -- the return value. --*/ --run_innerloop_exit: -- /* We're leaving. Check that nobody messed with -- FPSCR in ways we don't expect. */ -- fmrx r4, fpscr -- bic r4, #0xF8000000 /* mask out NZCV and QC */ -- bic r4, #0x0000009F /* mask out IDC,IXC,UFC,OFC,DZC,IOC */ -- cmp r4, #0 -- bne invariant_violation -- b run_innerloop_exit_REALLY -- --invariant_violation: -- mov r0, #VG_TRC_INVARIANT_FAILED -- b run_innerloop_exit_REALLY -- --run_innerloop_exit_REALLY: -- add sp, sp, #8 -- pop {r4, r5, r6, r7, r8, r9, fp, pc} -- - .size VG_(run_innerloop), .-VG_(run_innerloop) - - -Index: valgrind12305/coregrind/m_translate.c -=================================================================== ---- valgrind12305/coregrind/m_translate.c (revision 12305) -+++ valgrind12305/coregrind/m_translate.c (working copy) -@@ -1533,8 +1533,8 @@ - /* See comment in libvex.h. This target uses a - return-to-link-register scheme to get back to the dispatcher, so - both fields are NULL. */ -- vta.dispatch_assisted = NULL; -- vta.dispatch_unassisted = NULL; -+ //vta.dispatch_assisted = NULL; -+ //vta.dispatch_unassisted = NULL; - - # else - # error "Unknown arch" -Index: valgrind12305/Makefile.all.am -=================================================================== ---- valgrind12305/Makefile.all.am (revision 12305) -+++ valgrind12305/Makefile.all.am (working copy) -@@ -160,9 +160,9 @@ - - AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ - AM_CFLAGS_ARM_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \ -- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 -+ $(AM_CFLAGS_BASE) $(VGCONF_PLATFORM_ARM_ARCH) - AM_CCASFLAGS_ARM_LINUX = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ \ -- -marm -mcpu=cortex-a8 -g -+ $(VGCONF_PLATFORM_ARM_ARCH) -g - - AM_FLAG_M3264_X86_DARWIN = -arch i386 - AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \