Split packages into components

This commit is contained in:
zador-blood-stained
2016-07-21 18:15:43 +03:00
parent 6b74aa86ee
commit b4f29ca103
19 changed files with 28 additions and 14 deletions

View File

@@ -91,17 +91,20 @@ chroot_build_packages()
for plugin in $SRC/lib/extras-buildpkgs/*.conf; do
unset package_name package_repo package_ref package_builddeps package_install_chroot package_install_target \
package_prebuild_eval package_upstream_version needs_building
package_prebuild_eval package_upstream_version needs_building plugin_target_dir package_component
source $plugin
# check build arch
[[ $package_arch != $ARCH && $package_arch != all ]] && continue
local plugin_target_dir=$DEST/debs/extra/$RELEASE/$package_component/
mkdir -p $plugin_target_dir
# check if needs building
local needs_building=no
if [[ -n $package_install_target ]]; then
for f in $package_install_target; do
if [[ -z $(find $DEST/debs/extra/$RELEASE/ -name "${f}_*$REVISION*_$ARCH.deb") ]]; then
if [[ -z $(find $plugin_target_dir -name "${f}_*$REVISION*_$ARCH.deb") ]]; then
needs_building=yes
break
fi
@@ -169,7 +172,7 @@ chroot_build_packages()
eval systemd-nspawn -a -q -D $target_dir --tmpfs=/root/build --tmpfs=/tmp --bind-ro $SRC/lib/extras-buildpkgs/:/root/overlay \
--bind-ro $SRC/sources/extra/:/root/sources /bin/bash -c "/root/build.sh" 2>&1 \
${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/buildpkg.log'}
mv $target_dir/root/*.deb $DEST/debs/extra/$RELEASE/
mv $target_dir/root/*.deb $plugin_target_dir
done
} #############################################################################

View File

@@ -7,6 +7,7 @@ local package_builddeps="xutils-dev x11proto-xext-dev x11proto-dri2-dev pkg-conf
local package_install_chroot="libdri2-1 libdri2-dev"
local package_install_target="libdri2-1"
local package_arch="armhf"
local package_component="desktop"
package_checkinstall()
{

View File

@@ -6,6 +6,7 @@ local package_builddeps="graphviz ghostscript doxygen-latex x11proto-dri2-dev pk
local package_install_chroot="libvdpau1 libvdpau-dev"
local package_install_target="libvdpau1"
local package_arch="armhf"
local package_component="desktop"
package_checkinstall()
{

View File

@@ -6,6 +6,7 @@ local package_builddeps="dh-autoreconf pkg-config"
local package_install_chroot="libump libump-dev"
local package_install_target="libump"
local package_arch="armhf"
local package_component="desktop"
package_checkinstall()
{

View File

@@ -7,6 +7,7 @@ local package_upstream_version="1.0.1"
local package_install_chroot="libcedrus1 libcedrus1-dev"
local package_install_target="libcedrus1"
local package_arch="armhf"
local package_component="desktop"
package_checkinstall()
{

View File

@@ -6,6 +6,7 @@ local package_builddeps="cmake"
local package_install_chroot="libcsptr-dev"
local package_install_target="libcsptr-dev"
local package_arch="armhf"
local package_component="utils"
package_checkinstall()
{

View File

@@ -6,6 +6,7 @@ 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"
local package_component="desktop"
package_checkinstall()
{

View File

@@ -8,6 +8,7 @@ local package_builddeps="dpkg-dev flite1-dev frei0r-plugins-dev ladspa-sdk libas
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"
local package_component="desktop"
package_checkinstall()
{

View File

@@ -5,6 +5,7 @@ local package_ref="branch:master"
local package_builddeps="libgd2-xpm-dev libgd2-noxpm-dev libjpeg-dev libpng-dev libfreetype6-dev"
local package_install_target="fswebcam-gc2035"
local package_arch="armhf"
local package_component="desktop"
package_checkinstall()
{

View File

@@ -7,6 +7,7 @@ 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 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"
local package_component="desktop"
package_checkinstall()
{

View File

@@ -6,6 +6,7 @@ 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"
local package_component="utils"
package_checkinstall()
{

View File

@@ -6,6 +6,7 @@ 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"
local package_component="utils"
package_checkinstall()
{

View File

@@ -9,6 +9,7 @@ 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"
local package_component="desktop"
package_checkinstall()
{

View File

@@ -9,6 +9,7 @@ local package_upstream_version="0.18.1"
local package_builddeps="libasound2-dev libbluray-dev libcdio-paranoia-dev libdvdnav-dev libdvdread-dev libenca-dev libguess-dev libjpeg-dev liblcms2-dev liblua5.2-dev libpulse-dev librubberband-dev libsdl2-dev libsndio-dev libva-dev libx11-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev pkg-config python python-docutils"
local package_install_target="libmpv1 mpv"
local package_arch="armhf"
local package_component="desktop"
package_checkinstall()
{

View File

@@ -5,6 +5,7 @@ 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"
local package_component="desktop"
package_checkinstall()
{

View File

@@ -5,6 +5,7 @@ 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"
local package_component="utils"
package_checkinstall()
{

View File

@@ -6,6 +6,7 @@ local package_prebuild_eval="mkdir -p /usr/local/include/linux; cp linux/switch.
local package_builddeps="linux-headers-armmp libnl-3-dev libnl-genl-3-dev"
local package_install_target="swconfig"
local package_arch="armhf"
local package_component="utils"
package_checkinstall()
{

View File

@@ -24,8 +24,6 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
# Ubuntu ld adds -Bsymbolic-functions by default, but that prevents FFmpeg from building.
export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
CONFIG := --prefix=/usr \
--extra-version="$(DEB_REVISION)" \
--build-suffix="-ffmpeg" \
@@ -76,23 +74,20 @@ CONFIG := --prefix=/usr \
--enable-libxvid \
--enable-libzvbi \
--enable-x11grab \
--enable-libdc1394 \
--enable-libiec61883 \
--disable-openal \
--disable-opengl \
--disable-htmlpages \
--disable-podpages \
--disable-txtpages
--disable-txtpages \
--enable-vdpau
# Disable optimizations if requested.
ifneq (,$(filter $(DEB_BUILD_OPTIONS),noopt))
CONFIG += --disable-optimizations
endif
# Some libraries are build only on linux.
ifeq ($(DEB_HOST_ARCH_OS),linux)
CONFIG += --enable-libdc1394 \
--enable-libiec61883
endif
# ffmpeg is involed in build-dependency cycles with opencv and x264, so disable them in stage one.
# Also disable frei0r, which build-depends on opencv.
ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)

View File

@@ -12,8 +12,8 @@ Package: sunxi-mali-r3p0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libegl1-mesa, libgles1-mesa, libgles2-mesa
Provides: sunxi-mali
Conflicts: sunxi-mali
Provides: libegl1-mesa, libgles1-mesa, libgles2-mesa
Conflicts: libegl1-mesa, libgles1-mesa, libgles2-mesa
Description: Mali userspace binary driver version r3p0
This package contains a complete set of Mali userspace drivers,
including proprietary OpenGLESv2/EGL binaries.