core/linux-imx6* add freescale-specific userspace headers to /usr/include/linux

alarm/xbmc-imx remove dirty build conditionals
alarm/xbmc-imx remove linux-headers-imx6 to makedepends
This commit is contained in:
CrawX 2014-03-30 12:59:26 +02:00
parent b03a2f69f7
commit fb92b0af64
4 changed files with 34 additions and 17 deletions

View file

@ -12,8 +12,8 @@ pkgdesc="A software media player and entertainment hub for digital media for sel
arch=('armv7h')
url="http://xbmc.org"
license=('GPL' 'custom')
depends=('fribidi' 'lzo2' 'smbclient' 'libtiff' 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' 'libssh' 'libmicrohttpd' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'tinyxml' 'libplist' 'swig' 'taglib' 'libxslt' 'libfslvpuwrap' 'gpu-viv-bin-mx6q-fb' 'libcec-imx6' 'linux-headers-imx6' )
makedepends=('boost' 'cmake' 'gperf' 'nasm' 'zip' 'udisks' 'upower' 'git' 'autoconf' 'java-runtime-headless')
depends=('fribidi' 'lzo2' 'smbclient' 'libtiff' 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' 'libssh' 'libmicrohttpd' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'tinyxml' 'libplist' 'swig' 'taglib' 'libxslt' 'libfslvpuwrap' 'gpu-viv-bin-mx6q-fb' 'libcec-imx6')
makedepends=('boost' 'cmake' 'gperf' 'nasm' 'zip' 'udisks' 'upower' 'git' 'autoconf' 'java-runtime-headless' 'linux-headers-imx6')
optdepends=(
'lirc: remote controller support'
'udisks: automount external drives'
@ -78,18 +78,6 @@ build() {
export PYTHON_VERSION=2 # external python v2
INCLUDES="-I/opt/fsl/include"
# check for cubox-i, copy some headers and add them to the INCLUDES
_kernel_release="$(pacman -Qs linux-headers-imx6-cubox | head -n1 | grep -Eo "[^\ ]+$")"
if [[ -n "$_kernel_release" ]]; then
# dirty: copy headers from kernel as we need those but apart from that want to use the ones in /usr/include
KERNELSRC=/usr/src/linux-${_kernel_release}
mkdir -p linux-includes/include/linux
for f in mxcfb.h mxc_v4l2.h ipu.h; do
cp "${KERNELSRC}/include/linux/${f}" linux-includes/include/linux/
done
INCLUDES="$INCLUDES -I${srcdir}/${_gitname}/linux-includes/include"
fi
export CFLAGS="-Ofast -mfloat-abi=hard -mfpu=vfpv3-d16 -mtls-dialect=gnu -march=armv7-a -mtune=cortex-a9 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 $INCLUDES -Wl,-rpath,/opt/fsl/lib -L/opt/fsl/lib"
export CPPFLAGS="-Ofast -mfloat-abi=hard -mfpu=vfpv3-d16 -mtls-dialect=gnu -march=armv7-a -mtune=cortex-a9 -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 $INCLUDES -Wl,-rpath,/opt/fsl/lib -L/opt/fsl/lib"
export CXXFLAGS="-Ofast -mfloat-abi=hard -mfpu=vfpv3-d16 -mtls-dialect=gnu -march=armv7-a -mtune=cortex-a9 -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 $INCLUDES -Wl,-rpath,/opt/fsl/lib -L/opt/fsl/lib"

View file

@ -237,6 +237,17 @@ package_linux-headers-imx6-cubox-dt() {
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
#make uapi headers, some of them are needed for vpu/ipu usage
mkdir -p "${srcdir}/headers"
make headers_install ARCH=$KARCH INSTALL_HDR_PATH="${srcdir}/headers"
# copy freescale specific headers to /usr/include/linux
mkdir -p "${pkgdir}/usr/include/linux"
for f in "$srcdir/headers/include/linux"/mxc*.h "$srcdir/headers/include/linux/ipu.h"; do
cp "$f" "${pkgdir}/usr/include/linux"
done
# copy in Kconfig files
for i in `find . -name "Kconfig*"`; do
mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`

View file

@ -248,6 +248,18 @@ package_linux-headers-imx6-cubox() {
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
#make uapi headers, some of them are needed for vpu/ipu usage
mkdir -p "${srcdir}/headers"
make headers_install ARCH=$KARCH INSTALL_HDR_PATH="${srcdir}/headers"
# copy freescale specific headers to /usr/include/linux
mkdir -p "${pkgdir}/usr/include/linux"
for f in "$srcdir/headers/include/linux"/mxc*.h "$srcdir/headers/include/linux/ipu.h"; do
cp "$f" "${pkgdir}/usr/include/linux"
done
# copy in Kconfig files
for i in `find . -name "Kconfig*"`; do
mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`

View file

@ -218,10 +218,16 @@ _package-headers() {
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
# add freescale specific headers to uapi in /usr/include/linux
#make uapi headers, some of them are needed for vpu/ipu usage
mkdir -p "${srcdir}/headers"
make headers_install ARCH=$KARCH INSTALL_HDR_PATH="${srcdir}/headers"
# copy freescale specific headers to /usr/include/linux
mkdir -p "${pkgdir}/usr/include/linux"
for f in mxcfb.h mxc_v4l2.h ipu.h; do
cp "include/uapi/linux/$f" "${pkgdir}/usr/include/linux"
for f in "$srcdir/headers/include/linux"/mxc*.h "$srcdir/headers/include/linux/ipu.h"; do
cp "$f" "${pkgdir}/usr/include/linux"
done
# copy in Kconfig files