sys-apps/fwupd: Initial commit.

Package-Manager: Portage-2.3.6, Repoman-2.3.2
This commit is contained in:
Lars Wendler
2017-05-24 14:54:58 +02:00
parent 0c7cb03a39
commit 4e0151d9ff
6 changed files with 302 additions and 0 deletions
+2
View File
@@ -0,0 +1,2 @@
DIST fwupd-0.8.0.tar.gz 1296361 SHA256 b9c7550778747a2c47270ae518c65ab1111f749bbbd8f058ed7177201b414c10 SHA512 76c52a6902a6a4d651ad8e3694edf9d21320197baa7faf84fe1d4809e8e5990db43ae949a90bd72df6110d0df77f5181bd425a846c22f5ef749b9b6dac045bf8 WHIRLPOOL e7bdbd74f500257cf674cf7131c90e345dc7e2596ae14bbc3b11ff236ce633bb104ed7237fab974cc7c5c6edebcbe678816e8653dc04370614a1c54d0cb5b977
DIST fwupd-0.9.2.tar.gz 1313712 SHA256 a5a7a9886b0efbea57cbcbc841923a9272e4f26dd8658a8e1a90f6eec371cce1 SHA512 14dd3e7ee34f2bda0ed03d141715166ba7b4e69443f2ffd056e17a834d42ef8caa56d729b273e3890936c9b768c10ee6fbcf0d7e7d336c957901b93832ffe9c2 WHIRLPOOL 305e84be8c12a8f4da7897f7bb8c5599a608de315c90c5399c05637c65667f83e7187d851156643ebec7e402f3aecab320f02f4c2c1b69554b20561ce2a08b64
@@ -0,0 +1,65 @@
From 797e5672e64acd4f90cd52afca3bb192b28b4636 Mon Sep 17 00:00:00 2001
From: Julian Liu <liu.julian@gmail.com>
Date: Fri, 28 Apr 2017 18:09:20 +0800
Subject: [PATCH] Add polkit's ITS files as Ubuntu doesn't not ship with it.
Call msgfmt with custom_target for now as data_dir kargs for i18n.merge_file() not merged into master yet.
(https://github.com/mesonbuild/meson/issues/1565)
---
its/polkit.its | 8 ++++++++
its/polkit.loc | 6 ++++++
policy/meson.build | 12 ++++++++----
3 files changed, 22 insertions(+), 4 deletions(-)
create mode 100644 its/polkit.its
create mode 100644 its/polkit.loc
diff --git a/its/polkit.its b/its/polkit.its
new file mode 100644
index 0000000..1c37e6b
--- /dev/null
+++ b/its/polkit.its
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its"
+ version="2.0">
+ <its:translateRule selector="//*" translate="no"/>
+ <its:translateRule selector="//action/description |
+ //action/message"
+ translate="yes"/>
+</its:rules>
diff --git a/its/polkit.loc b/its/polkit.loc
new file mode 100644
index 0000000..c7427ec
--- /dev/null
+++ b/its/polkit.loc
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<locatingRules>
+ <locatingRule name="polkit policy" pattern="*.policy">
+ <documentRule localName="policyconfig" target="polkit.its"/>
+ </locatingRule>
+</locatingRules>
diff --git a/policy/meson.build b/policy/meson.build
index def8976..41da2db 100644
--- a/policy/meson.build
+++ b/policy/meson.build
@@ -1,11 +1,15 @@
install_data('org.freedesktop.fwupd.rules',
install_dir : 'share/polkit-1/rules.d')
-i18n.merge_file(
- input: 'org.freedesktop.fwupd.policy.in',
+envbin = find_program('env')
+gettext_data_dir = 'GETTEXTDATADIRS=' + meson.source_root()
+custom_target('org.freedesktop.fwupd.policy',
output: 'org.freedesktop.fwupd.policy',
- type: 'xml',
- po_dir: join_paths(meson.source_root(), 'po'),
+ input: 'org.freedesktop.fwupd.policy.in',
+ command: [envbin, gettext_data_dir, 'msgfmt', '--xml',
+ '--template', '@INPUT@',
+ '-d', join_paths(meson.source_root(), 'po'),
+ '-o', '@OUTPUT@'],
install: true,
install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions')
)
@@ -0,0 +1,77 @@
--- fwupd-0.9.2/data/meson.build
+++ fwupd-0.9.2/data/meson.build
@@ -38,20 +38,22 @@
'system-services'),
)
-# replace @bindir@
-configure_file(
- input : 'fwupd-offline-update.service.in',
- output : 'fwupd-offline-update.service',
- configuration : con2,
- install: true,
- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
-)
+if get_option('with-systemd') and systemd.found()
+ # replace @bindir@
+ configure_file(
+ input : 'fwupd-offline-update.service.in',
+ output : 'fwupd-offline-update.service',
+ configuration : con2,
+ install: true,
+ install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
+ )
-# replace @localstatedir@ and @bootdir@
-configure_file(
- input : 'fwupd.service.in',
- output : 'fwupd.service',
- configuration : con2,
- install: true,
- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
-)
+ # replace @localstatedir@ and @bootdir@
+ configure_file(
+ input : 'fwupd.service.in',
+ output : 'fwupd.service',
+ configuration : con2,
+ install: true,
+ install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
+ )
+endif
--- fwupd-0.9.2/meson.build
+++ fwupd-0.9.2/meson.build
@@ -127,13 +127,17 @@
gpgme = cc.find_library('gpgme')
gpgerror = cc.find_library('libgpg-error')
libm = cc.find_library('libm', required: false)
-systemd = dependency('systemd')
udev = dependency('udev')
if valgrind.found()
conf.set('HAVE_VALGRIND', '1')
endif
+if get_option('with-systemd')
+ systemd = dependency('systemd')
+ conf.set('HAVE_SYSTEMD', '1')
+endif
+
if get_option('enable-colorhug')
colorhug = dependency('colorhug', version : '>= 1.2.12')
conf.set('HAVE_COLORHUG', '1')
@@ -220,4 +224,6 @@
message('git not found, you will not be able to run `ninja dist`')
endif
-meson.add_install_script('meson_post_install.sh', systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir)
+if get_option('with-systemd') and systemd.found()
+ meson.add_install_script('meson_post_install.sh', systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir)
+endif
--- fwupd-0.9.2/meson_options.txt
+++ fwupd-0.9.2/meson_options.txt
@@ -5,3 +5,4 @@
option('enable-dell', type : 'boolean', value : true, description : 'enable Dell-specific support')
option('enable-thunderbolt', type : 'boolean', value : true, description : 'enable Thunderbolt support')
option('with-bootdir', type : 'string', value : '/boot/efi', description : 'Directory for EFI system partition')
+option('with-systemd', type : 'boolean', value : true, description : 'Install systemd unit files')
+74
View File
@@ -0,0 +1,74 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools udev systemd
DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
HOMEPAGE="http://www.fwupd.org"
SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="colorhug dell doc elf nls uefi"
RDEPEND="
app-crypt/gpgme
dev-db/sqlite
dev-libs/appstream-glib
>=dev-libs/glib-2.45.8:2
dev-libs/libgpg-error
dev-libs/libgudev
dev-libs/libgusb
>=net-libs/libsoup-2.51.92:2.4
>=sys-auth/polkit-0.103
colorhug? ( >=x11-misc/colord-1.2.12:0= )
dell? (
sys-libs/efivar
>=sys-libs/libsmbios-2.3.0
)
elf? ( dev-libs/libelf )
uefi? ( >=sys-apps/fwupdate-5 )
"
DEPEND="
${RDEPEND}
app-arch/gcab
app-arch/libarchive
app-text/docbook-sgml-utils
dev-util/gtk-doc
virtual/pkgconfig
"
REQUIRED_USE="dell? ( uefi )"
src_prepare() {
default
# Don't look for gtk-doc if doc USE is unset (breaks automake)
if ! use doc ; then
sed 's@^GTK_DOC_CHECK@#\0@' -i configure.ac || die
sed '/gtk-doc\.make/d' \
-i {.,docs/{libdfu,libfwupd}}/Makefile.am || die
fi
eautoreconf
}
src_configure() {
local myeconfargs=(
# requires libtbtfwu which is not packaged yet
--disable-thunderbolt
--with-systemdunitdir="$(systemd_get_systemunitdir)"
--with-udevrulesdir="$(get_udevdir)"/rules.d
$(use_enable colorhug)
$(use_enable dell)
$(use_enable dell synaptics)
$(use_enable elf libelf)
$(use_enable nls)
$(use_enable uefi)
)
econf "${myeconfargs[@]}"
}
+65
View File
@@ -0,0 +1,65 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit meson udev systemd
DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
HOMEPAGE="http://www.fwupd.org"
SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="colorhug dell doc elf nls systemd uefi"
RDEPEND="
app-crypt/gpgme
dev-db/sqlite
dev-libs/appstream-glib
>=dev-libs/glib-2.45.8:2
dev-libs/libgpg-error
dev-libs/libgudev
dev-libs/libgusb
>=net-libs/libsoup-2.51.92:2.4
>=sys-auth/polkit-0.103
colorhug? ( >=x11-misc/colord-1.2.12:0= )
dell? (
sys-libs/efivar
>=sys-libs/libsmbios-2.3.0
)
elf? ( dev-libs/libelf )
systemd? ( sys-apps/systemd )
uefi? ( >=sys-apps/fwupdate-5 )
"
DEPEND="
${RDEPEND}
app-arch/gcab
app-arch/libarchive
app-text/docbook-sgml-utils
dev-util/gtk-doc
virtual/pkgconfig
"
REQUIRED_USE="dell? ( uefi )"
PATCHES=(
"${FILESDIR}/${PN}-0.9-polkit_its_files.patch"
"${FILESDIR}/${PN}-0.9.2-no_systemd.patch"
)
src_configure() {
local emesonargs=(
# requires libtbtfwu which is not packaged yet
-Denable-thunderbolt=false
-Dwith-systemd="$(usex systemd true false)"
-Dwith-udevrulesdir="$(get_udevdir)"/rules.d
-Denable-colorhug="$(usex colorhug true false)"
-Denable-dell="$(usex dell true false)"
-Denable-libelf="$(usex elf true false)"
-Denable-uefi="$(usex uefi true false)"
)
meson_src_configure
}
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
<use>
<flag name="colorhug">Enable ColorHug support through
<pkg>x11-misc/colord</pkg> package.</flag>
<flag name="dell">Enable Dell-specific support.</flag>
<flag name="elf">Enable libelf support through
<pkg>dev-libs/libelf</pkg> package.</flag>
<flag name="uefi">Enable UEFI support</flag>
</use>
<upstream>
<remote-id type="github">hughsie/fwupd</remote-id>
</upstream>
</pkgmetadata>