From c9a03784d2ad1d3f45b66a0096a7b98a18e4a29e Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Tue, 12 Jul 2016 21:31:09 +0300 Subject: [PATCH] Limit target architecture for chroot-buildpackages --- chroot-buildpackages.sh | 3 +++ extras-buildpkgs/00-libdri2.conf | 1 + extras-buildpkgs/04-libvdpau.conf | 1 + extras-buildpkgs/05-libump.conf | 1 + extras-buildpkgs/06-libcedrus.conf | 1 + extras-buildpkgs/06-libcsptr-dev.conf | 1 + extras-buildpkgs/06-xf86-video-fbturbo.conf | 1 + extras-buildpkgs/09-ffmpeg.conf | 1 + extras-buildpkgs/90-guvcview.conf | 1 + extras-buildpkgs/90-hostapd-realtek.conf | 1 + extras-buildpkgs/90-hostapd.conf | 1 + extras-buildpkgs/90-libvdpau-sunxi.conf | 1 + extras-buildpkgs/90-mpv.conf | 1 + extras-buildpkgs/90-sunxi-mali-r3p0.conf | 1 + extras-buildpkgs/90-sunxi-tools.conf | 1 + extras-buildpkgs/90-swconfig.conf | 1 + 16 files changed, 18 insertions(+) diff --git a/chroot-buildpackages.sh b/chroot-buildpackages.sh index 114f1ca950..0e2ba6e8d0 100644 --- a/chroot-buildpackages.sh +++ b/chroot-buildpackages.sh @@ -91,6 +91,9 @@ chroot_build_packages() package_prebuild_eval package_upstream_version needs_building source $plugin + # check build arch + [[ $package_arch != $ARCH || $package_arch != all ]] && continue + # check if needs building local needs_building=no if [[ -n $package_install_target ]]; then diff --git a/extras-buildpkgs/00-libdri2.conf b/extras-buildpkgs/00-libdri2.conf index 720d59d43e..839cacd3f8 100644 --- a/extras-buildpkgs/00-libdri2.conf +++ b/extras-buildpkgs/00-libdri2.conf @@ -6,6 +6,7 @@ local package_upstream_version="1.0.1" local package_builddeps="xutils-dev x11proto-xext-dev x11proto-dri2-dev quilt pkg-config libxfixes-dev libxext-dev libdrm-dev dh-autoreconf" local package_install_chroot="libdri2-1 libdri2-dev" local package_install_target="libdri2-1" +local package_arch="armhf" package_checkinstall() { diff --git a/extras-buildpkgs/04-libvdpau.conf b/extras-buildpkgs/04-libvdpau.conf index beacff4a4f..8f1c6c83c0 100644 --- a/extras-buildpkgs/04-libvdpau.conf +++ b/extras-buildpkgs/04-libvdpau.conf @@ -5,6 +5,7 @@ local package_ref="branch:master" local package_builddeps="graphviz ghostscript doxygen-latex x11proto-dri2-dev pkg-config libxext-dev libx11-dev dh-autoreconf" local package_install_chroot="libvdpau1 libvdpau-dev" local package_install_target="libvdpau1" +local package_arch="armhf" package_checkinstall() { diff --git a/extras-buildpkgs/05-libump.conf b/extras-buildpkgs/05-libump.conf index 4b3b59c6bd..03e2078749 100644 --- a/extras-buildpkgs/05-libump.conf +++ b/extras-buildpkgs/05-libump.conf @@ -5,6 +5,7 @@ local package_ref="branch:ump" local package_builddeps="dh-autoreconf pkg-config" local package_install_chroot="libump libump-dev" local package_install_target="libump" +local package_arch="armhf" package_checkinstall() { diff --git a/extras-buildpkgs/06-libcedrus.conf b/extras-buildpkgs/06-libcedrus.conf index 6549a16c5b..2138b6f7e7 100644 --- a/extras-buildpkgs/06-libcedrus.conf +++ b/extras-buildpkgs/06-libcedrus.conf @@ -6,6 +6,7 @@ local package_ref="branch:master" local package_upstream_version="1.0.1" local package_install_chroot="libcedrus1 libcedrus1-dev" local package_install_target="libcedrus1" +local package_arch="armhf" package_checkinstall() { diff --git a/extras-buildpkgs/06-libcsptr-dev.conf b/extras-buildpkgs/06-libcsptr-dev.conf index 83684cca6f..7d9afa8122 100644 --- a/extras-buildpkgs/06-libcsptr-dev.conf +++ b/extras-buildpkgs/06-libcsptr-dev.conf @@ -5,6 +5,7 @@ local package_ref="branch:master" local package_builddeps="cmake" local package_install_chroot="libcsptr-dev" local package_install_target="libcsptr-dev" +local package_arch="armhf" package_checkinstall() { diff --git a/extras-buildpkgs/06-xf86-video-fbturbo.conf b/extras-buildpkgs/06-xf86-video-fbturbo.conf index bba4f1670a..0e13c6a9bb 100644 --- a/extras-buildpkgs/06-xf86-video-fbturbo.conf +++ b/extras-buildpkgs/06-xf86-video-fbturbo.conf @@ -5,6 +5,7 @@ local package_repo="https://github.com/ssvb/xf86-video-fbturbo.git" local package_ref="branch:master" local package_builddeps="dh-autoreconf pkg-config xserver-xorg-dev x11proto-core-dev x11proto-fonts-dev x11proto-randr-dev x11proto-render-dev x11proto-video-dev xutils-dev" local package_install_target="xserver-xorg-video-fbturbo" +local package_arch="armhf" package_checkinstall() { diff --git a/extras-buildpkgs/09-ffmpeg.conf b/extras-buildpkgs/09-ffmpeg.conf index 1f05e28412..f47eefd975 100644 --- a/extras-buildpkgs/09-ffmpeg.conf +++ b/extras-buildpkgs/09-ffmpeg.conf @@ -6,6 +6,7 @@ local package_upstream_version="7:3.1.1" local package_builddeps="dpkg-dev flite1-dev frei0r-plugins-dev ladspa-sdk libass-dev libavc1394-dev libbluray-dev libbs2b-dev libbz2-dev libcaca-dev libcdio-paranoia-dev libdc1394-22-dev libfontconfig1-dev libfreetype6-dev libfribidi-dev libgl1-mesa-dev libgme-dev libgnutls28-dev libgsm1-dev libiec61883-dev libjack-jackd2-dev liblzma-dev libmodplug-dev libmp3lame-dev libopenal-dev libopencv-dev libopenjpeg-dev libopus-dev libpulse-dev librtmp-dev libschroedinger-dev libsctp-dev libsdl1.2-dev libshine-dev libsnappy-dev libsoxr-dev libspeex-dev libssh-gcrypt-dev libtheora-dev libtwolame-dev libva-dev libvdpau-dev libvorbis-dev libvpx-dev libwavpack-dev libwebp-dev libx264-dev libx265-dev libxext-dev libxvidcore-dev libxvmc-dev libzmq3-dev libzvbi-dev pkg-config yasm" local package_install_chroot="libavutil-ffmpeg54 libavutil-dev libpostproc-ffmpeg53 libswresample-ffmpeg1 libswscale-ffmpeg3 libswscale-dev libavresample-ffmpeg2 libavresample-dev libavcodec-ffmpeg56 libswresample-dev libavcodec-dev libpostproc-dev libavformat-ffmpeg56 libavformat-dev libavfilter-ffmpeg5 libavfilter-dev libavdevice-ffmpeg56 libavdevice-dev" local package_install_target="libavutil-ffmpeg54 libpostproc-ffmpeg53 libswresample-ffmpeg1 libswscale-ffmpeg3 libavresample-ffmpeg2 libavcodec-ffmpeg56 libavformat-ffmpeg56 libavfilter-ffmpeg5 libavdevice-ffmpeg56 ffmpeg" +local package_arch="armhf" package_checkinstall() { diff --git a/extras-buildpkgs/90-guvcview.conf b/extras-buildpkgs/90-guvcview.conf index dae59d0850..1bf2c00a1e 100644 --- a/extras-buildpkgs/90-guvcview.conf +++ b/extras-buildpkgs/90-guvcview.conf @@ -6,6 +6,7 @@ local package_ref="branch:master" local package_upstream_version="2.0.2.1" local package_builddeps="intltool dh-autoreconf autotools-dev libsdl1.2-dev libgtk-3-dev portaudio19-dev libpng12-dev libavcodec-dev libavutil-dev libudev-dev libusb-1.0-0-dev libpulse-dev libgsl0-dev libv4l-dev libv4l2rds0 libsdl2-dev" local package_install_target="libguvcview-1.1-1 guvcview" +local package_arch="armhf" package_checkinstall() { diff --git a/extras-buildpkgs/90-hostapd-realtek.conf b/extras-buildpkgs/90-hostapd-realtek.conf index 08cea463b1..05e67646a1 100644 --- a/extras-buildpkgs/90-hostapd-realtek.conf +++ b/extras-buildpkgs/90-hostapd-realtek.conf @@ -5,6 +5,7 @@ local package_ref="branch:hostap_2_5" local package_upstream_version="2.5" local package_builddeps="pkg-config libssl-dev libreadline-dev libpcsclite-dev libnl-route-3-dev libnl-genl-3-dev libnl-3-dev libncurses5-dev libdbus-1-dev docbook-utils docbook-to-man" local package_install_target="hostapd-realtek" +local package_arch="all" package_checkinstall() { diff --git a/extras-buildpkgs/90-hostapd.conf b/extras-buildpkgs/90-hostapd.conf index 25727adfb9..7e4a3765c6 100644 --- a/extras-buildpkgs/90-hostapd.conf +++ b/extras-buildpkgs/90-hostapd.conf @@ -5,6 +5,7 @@ local package_ref="branch:hostap_2_5" local package_upstream_version="2.5" local package_builddeps="pkg-config libssl-dev libreadline-dev libpcsclite-dev libnl-route-3-dev libnl-genl-3-dev libnl-3-dev libncurses5-dev libdbus-1-dev docbook-utils docbook-to-man" local package_install_target="hostapd" +local package_arch="all" package_checkinstall() { diff --git a/extras-buildpkgs/90-libvdpau-sunxi.conf b/extras-buildpkgs/90-libvdpau-sunxi.conf index 25b26c2ab7..e5bec29c7a 100644 --- a/extras-buildpkgs/90-libvdpau-sunxi.conf +++ b/extras-buildpkgs/90-libvdpau-sunxi.conf @@ -7,6 +7,7 @@ local package_ref="branch:master" local package_upstream_version="0.5.1" local package_builddeps="libpixman-1-dev pkg-config" local package_install_target="libvdpau-sunxi1" +local package_arch="armhf" package_checkinstall() { diff --git a/extras-buildpkgs/90-mpv.conf b/extras-buildpkgs/90-mpv.conf index 61d78104a6..329cddb87d 100644 --- a/extras-buildpkgs/90-mpv.conf +++ b/extras-buildpkgs/90-mpv.conf @@ -7,6 +7,7 @@ local package_ref="tag:v0.18.0" local package_upstream_version="0.18.0" local package_builddeps="libasound2-dev libbluray-dev libcdio-paranoia-dev libdvdnav-dev libdvdread-dev libegl1-mesa-dev libenca-dev libgl1-mesa-dev libguess-dev libjack-dev libjpeg-dev liblcms2-dev liblua5.2-dev libpulse-dev librubberband-dev libsdl2-dev libsndio-dev libva-dev libvdpau-dev libwayland-dev libx11-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxv-dev pkg-config python python-docutils" local package_install_target="libmpv1 mpv" +local package_arch="armhf" package_checkinstall() { diff --git a/extras-buildpkgs/90-sunxi-mali-r3p0.conf b/extras-buildpkgs/90-sunxi-mali-r3p0.conf index 0538743da1..9da1d715f6 100644 --- a/extras-buildpkgs/90-sunxi-mali-r3p0.conf +++ b/extras-buildpkgs/90-sunxi-mali-r3p0.conf @@ -4,6 +4,7 @@ local package_repo="https://github.com/linux-sunxi/sunxi-mali.git" local package_ref="branch:master" local package_builddeps="xutils-dev" local package_install_target="sunxi-mali-r3p0 sunxi-mali-r3p0-dev" +local package_arch="armhf" package_checkinstall() { diff --git a/extras-buildpkgs/90-sunxi-tools.conf b/extras-buildpkgs/90-sunxi-tools.conf index 59dc5c9abc..ec27845557 100644 --- a/extras-buildpkgs/90-sunxi-tools.conf +++ b/extras-buildpkgs/90-sunxi-tools.conf @@ -4,6 +4,7 @@ local package_repo="https://github.com/linux-sunxi/sunxi-tools.git" local package_ref="branch:master" local package_builddeps="libusb-1.0-0-dev ruby binutils-arm-none-eabi pkg-config u-boot-tools" local package_install_target="sunxi-tools" +local package_arch="all" package_checkinstall() { diff --git a/extras-buildpkgs/90-swconfig.conf b/extras-buildpkgs/90-swconfig.conf index f6408d6a59..13d30be1d0 100644 --- a/extras-buildpkgs/90-swconfig.conf +++ b/extras-buildpkgs/90-swconfig.conf @@ -5,6 +5,7 @@ local package_ref="branch:master" local package_prebuild_eval="mkdir -p /usr/local/include/linux; cp linux/switch.h /usr/local/include/linux/" local package_builddeps="linux-headers-armmp libnl-3-dev libnl-genl-3-dev" local package_install_target="swconfig" +local package_arch="armhf" package_checkinstall() {