From e4ea95cced10bf9d5419b895bd0f92ea5fe4a99a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 9 May 2014 11:44:12 +0200 Subject: [PATCH] sane: cross build support: split udev rules into its own subpkg. --- srcpkgs/sane-udev-rules | 1 + srcpkgs/sane/template | 28 ++++++++++++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) create mode 120000 srcpkgs/sane-udev-rules diff --git a/srcpkgs/sane-udev-rules b/srcpkgs/sane-udev-rules new file mode 120000 index 00000000000..e1e3b8044e7 --- /dev/null +++ b/srcpkgs/sane-udev-rules @@ -0,0 +1 @@ +sane \ No newline at end of file diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template index 6aeab2ce284..e5c53432c16 100644 --- a/srcpkgs/sane/template +++ b/srcpkgs/sane/template @@ -1,7 +1,7 @@ # Template build file for 'sane'. pkgname=sane version=1.0.24 -revision=4 +revision=5 wrksrc="sane-backends-${version}" build_style=gnu-configure configure_args="--disable-locking --enable-avahi --disable-latex --enable-ipv6 @@ -10,7 +10,7 @@ hostmakedepends="pkg-config" makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel v4l-utils-devel libusb-devel net-snmp-devel libieee1284-devel openssl-devel cups-devel" -depends="net-snmp" +depends="net-snmp sane-udev-rules-${version}_${revision}" systemd_services="saned.socket on" conf_files=" /etc/sane.d/abaton.conf @@ -100,16 +100,19 @@ checksum=27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d post_install() { # fix hp officejets echo "#hpaio" >> ${DESTDIR}/etc/sane.d/dll.conf - # install udev files - vinstall tools/udev/libsane.rules 644 usr/lib/udev/rules.d 49-sane.rules - # fix udev rules - sed -i 's|NAME="%k", ||g' ${DESTDIR}/usr/lib/udev/rules.d/49-sane.rules # Install systemd service. vinstall ${FILESDIR}/saned@.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/saned.socket 644 usr/lib/systemd/system vinstall ${FILESDIR}/saned.xinetd 644 etc/xinetd.d saned.conf vinstall ${wrksrc}/tools/sane-backends.pc 644 usr/lib/pkgconfig + + if [ -z "$CROSS_BUILD" ]; then + # install udev files + vinstall tools/udev/libsane.rules 644 usr/lib/udev/rules.d 49-sane.rules + # fix udev rules + sed -i 's|NAME="%k", ||g' ${DESTDIR}/usr/lib/udev/rules.d/49-sane.rules + fi } libsane_package() { @@ -119,6 +122,19 @@ libsane_package() { } } +if [ -z "$CROSS_BUILD" ]; then + +sane-udev-rules_package() { + short_desc+=" - udev rules" + noarch=yes + replaces="sane<1.0.24_5" + pkg_install() { + vmove usr/lib/udev/rules.d + } +} + +fi + sane-devel_package() { depends="libsane>=${version}_${revision}" short_desc+=" - development files"