enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert libcedrus to ION from UMP

Browse Source 
Fix sunxi-mali dependencies conflict
This commit is contained in:
zador-blood-stained 2016-07-29 18:56:48 +03:00
parent 1659b2b99a
commit 120faeaa93
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chroot-buildpackages.sh
View File

@ -283,10 +283,10 @@ chroot_installpackages()
mkdir -p /tmp/aptly-temp/
aptly -config=$conf repo create temp
# NOTE: this works recursively
aptly -config=$conf -force-replace=true repo add temp $DEST/debs/extra/$RELEASE/
aptly -config=$conf repo add temp $DEST/debs/extra/$RELEASE/
# -gpg-key="128290AF"
aptly -secret-keyring="$SRC/lib/extras-buildpkgs/buildpkg.gpg" -batch -config=$conf \
-force-overwrite=true -component=temp -distribution=$RELEASE publish repo temp
-component=temp -distribution=$RELEASE publish repo temp
aptly -config=$conf -listen=":8189" serve &
local aptly_pid=$!
cp $SRC/lib/extras-buildpkgs/buildpkg.key $CACHEDIR/sdcard/tmp/buildpkg.key
@ -309,10 +309,12 @@ chroot_installpackages()
cat <<-EOF > $CACHEDIR/sdcard/tmp/install.sh
#!/bin/bash
apt-key add /tmp/buildpkg.key
apt-get -q update
apt-get -o Acquire::http::Proxy=\"http://${APT_PROXY_ADDR:-localhost:3142}\" \
-o Acquire::http::Proxy::localhost="DIRECT" -q update
# uncomment to debug
# /bin/bash
apt-get -q -o Acquire::http::Proxy=\"http://${APT_PROXY_ADDR:-localhost:3142}\" \
-o Acquire::http::Proxy::localhost="DIRECT" \
--show-progress -o DPKG::Progress-Fancy=1 install -y $install_list
apt-get clean
apt-key del 128290AF

1
extras-buildpkgs/libcedrus/debian/libcedrus1.postinst
View File

@ -3,6 +3,7 @@
case "$1" in
install)
which udevadm > /dev/null && udevadm trigger --action=add --sysname-match=cedar_dev || true
which udevadm > /dev/null && udevadm trigger --action=add --sysname-match=ion || true
;;
esac

1
extras-buildpkgs/libcedrus/debian/libcedrus1.udev
View File

@ -1 +1,2 @@
KERNEL=="cedar_dev", MODE="0660", GROUP="video"
KERNEL=="ion", MODE="0660", GROUP="video"

4
extras-buildpkgs/libcedrus/debian/rules
View File

@ -2,8 +2,8 @@
PACKAGE = libcedrus
override_dh_auto_build:
dh_auto_build -- USE_UMP=1
#override_dh_auto_build:
# dh_auto_build -- USE_UMP=1
override_dh_auto_install:
dh_auto_install -- prefix=/usr libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)

2
extras-buildpkgs/sunxi-mali-r3p0/debian/control
View File

@ -13,7 +13,6 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libegl1-mesa, libgles1-mesa, libgles2-mesa
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.
@ -24,7 +23,6 @@ Architecture: any
Depends: sunxi-mali-r3p0 (= ${binary:Version}), ${misc:Depends}
Replaces: libegl1-mesa-dev, libgles1-mesa-dev, libgles2-mesa-dev
Provides: libegl1-mesa-dev, libgles1-mesa-dev, libgles2-mesa-dev
Conflicts: libegl1-mesa-dev, libgles1-mesa-dev, libgles2-mesa-dev
Description: Mali userspace binary driver version r3p0
This package contains a complete set of Mali userspace drivers,
including proprietary OpenGLESv2/EGL binaries.