public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fwupd: 0.9.6 → 1.0.1

Browse Source
This commit is contained in:
Jan Tojnar 2017-09-18 15:14:21 +02:00
parent b8f7027360
commit 227a92f698
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 138 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -1,31 +1,56 @@
{ stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool { stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool
, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking
, libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar , libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar, glibcLocales
, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3 , fwupdate, libyaml, valgrind, meson, libuuid, pygobject3, colord
, pillow, ninja, gcab , pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook
}: }:
let version = "0.9.6"; let
in version = "1.0.1";
stdenv.mkDerivation in stdenv.mkDerivation {
{ name = "fwupd-${version}"; name = "fwupd-${version}";
src = fetchurl src = fetchurl {
{ url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "0h3y4ygckvkjdx7yxwbm273iv84yk37ivlcf4xvq95g64vs8gfhf"; sha256 = "1k627rja7df51dkzqvkzgbwrrj4049k6408d01m34n66zwr2fp59";
}; };
buildInputs =
[ gtk_doc pkgconfig gobjectIntrospection intltool libgudev nativeBuildInputs = [
polkit appstream-glib gusb sqlite libarchive libsoup meson ninja gtk_doc pkgconfig gobjectIntrospection intltool glibcLocales
docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind valgrind gcab docbook2x libxslt pygobject3 python3Packages.pycairo wrapGAppsHook
meson gpgme libuuid pygobject3 pillow ninja gcab ];
]; buildInputs = [
patches = [ ./fix-missing-deps.patch ]; polkit appstream-glib gusb sqlite libarchive libsoup libelf libsmbios fwupdate libyaml
preConfigure = '' libgudev colord gpgme libuuid pillow gnutls glib_networking
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${efivar}/include/efivar" ];
'';
mesonFlags = [ "-Denable-colorhug=false" "-Denable-man=false" "-Denable-tests=false" "--localstatedir=/var" "-Denable-doc=false" "-Dwith-bootdir=/boot" ]; LC_ALL = "en_US.UTF-8"; # For po/make-images
enableParallelBuilding = true;
meta = NIX_CFLAGS_COMPILE = [
{ license = [ stdenv.lib.licenses.gpl2 ]; "-I${efivar}/include/efivar"
platforms = stdenv.lib.platforms.linux; # warning: "__LIBELF_INTERNAL__" is not defined
}; "-Wno-error=undef"
} ];
patches = [
./fix-missing-deps.patch
];
postPatch = ''
patchShebangs .
'';
mesonFlags = [
"-Denable-man=false"
"-Denable-tests=false"
"-Denable-doc=false"
"-Dwith-bootdir=/boot"
"-Dwith-udevdir=lib/udev"
"-Dwith-systemdunitdir=lib/systemd/system"
"--localstatedir=/var"
];
enableParallelBuilding = true;
meta = {
homepage = https://fwupd.org/;
license = [ stdenv.lib.licenses.gpl2 ];
platforms = stdenv.lib.platforms.linux;
};
}

178
pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch
View File

@ -1,86 +1,99 @@
diff -Naur fwupd-0.9.6-orig/data/meson.build fwupd-0.9.6/data/meson.build --- a/data/builder/meson.build
--- fwupd-0.9.6-orig/data/meson.build 2017-08-03 05:45:02.000000000 -0400 +++ b/data/builder/meson.build
+++ fwupd-0.9.6/data/meson.build 2017-09-02 19:58:37.324596487 -0400 @@ -1,3 +0,0 @@
@@ -20,7 +20,7 @@ -install_data('README.md',
- install_dir : join_paths(get_option('localstatedir'), 'lib', 'fwupd', 'builder')
-)
--- a/data/meson.build
+++ b/data/meson.build
@@ -7,16 +7,12 @@
subdir('installed-tests')
endif
-install_data(['daemon.conf'],
- install_dir : join_paths(get_option('sysconfdir'), 'fwupd')
-)
-
install_data(['org.freedesktop.fwupd.metainfo.xml'],
install_dir: join_paths(get_option('datadir'), 'metainfo')
) )
install_data(['90-fwupd-devices.rules'], install_data(['org.freedesktop.fwupd.conf'],
- install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') - install_dir : join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d')
+ install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') + install_dir : join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d')
) )
con2 = configuration_data() install_data(['metadata.xml'],
@@ -52,7 +52,7 @@ --- a/data/pki/meson.build
output : 'fwupd-offline-update.service', +++ b/data/pki/meson.build
configuration : con2, @@ -3,13 +3,13 @@
install: true, 'GPG-KEY-Hughski-Limited',
- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), 'GPG-KEY-Linux-Vendor-Firmware-Service',
+ install_dir: join_paths(get_option('prefix'), 'lib', 'systemd', 'system'), ],
- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd')
+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
)
install_data([
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd-metadata')
+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
) )
endif endif
@@ -63,6 +63,6 @@ @@ -17,12 +17,12 @@
output : 'fwupd.service', install_data([
configuration : con2, 'LVFS-CA.pem',
install: true, ],
- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), - install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd')
+ install_dir: join_paths(get_option('prefix'), 'lib', 'systemd', 'system'), + install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
)
install_data([
'LVFS-CA.pem',
],
- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd-metadata')
+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
) )
endif endif
diff -Naur fwupd-0.9.6-orig/libdfu/meson.build fwupd-0.9.6/libdfu/meson.build
--- fwupd-0.9.6-orig/libdfu/meson.build 2017-08-03 05:45:02.000000000 -0400
+++ fwupd-0.9.6/libdfu/meson.build 2017-09-02 19:58:37.325596508 -0400
@@ -23,6 +23,10 @@
giounix,
libm,
gusb,
+ uuid,
+ libarchive,
+ soup,
+ libgcab
]
if get_option('enable-libelf') --- a/data/remotes.d/meson.build
diff -Naur fwupd-0.9.6-orig/meson.build fwupd-0.9.6/meson.build +++ b/data/remotes.d/meson.build
--- fwupd-0.9.6-orig/meson.build 2017-08-03 05:45:02.000000000 -0400 @@ -3,7 +3,7 @@
+++ fwupd-0.9.6/meson.build 2017-09-02 19:59:07.406216716 -0400 'lvfs.conf',
@@ -124,6 +124,7 @@ 'lvfs-testing.conf',
if polkit.version().version_compare('>= 0.114') ],
conf.set('HAVE_POLKIT_0_114', '1') - install_dir : join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d')
endif + install_dir : join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d')
+libgcab = dependency('libgcab-1.0') )
gudev = dependency('gudev-1.0')
appstream_glib = dependency('appstream-glib', version : '>= 0.6.9')
gusb = dependency('gusb', version : '>= 0.2.9')
@@ -200,7 +201,7 @@
'fwupd-plugins-2')
conf.set_quoted('PLUGINDIR', plugin_dir)
-conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
+conf.set_quoted('SYSCONFDIR', '/etc')
conf.set_quoted('BINDIR',
join_paths(get_option('prefix'),
get_option('bindir')))
@@ -227,6 +228,9 @@
plugin_deps += gmodule
plugin_deps += gusb
plugin_deps += soup
+plugin_deps += libarchive
+plugin_deps += uuid
+plugin_deps += libgcab
subdir('data')
subdir('docs')
@@ -255,6 +259,3 @@
endif
endif endif
-if get_option('enable-systemd') @@ -19,12 +19,12 @@
- meson.add_install_script('meson_post_install.sh', systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir) output : 'fwupd.conf',
-endif configuration : con2,
diff -Naur fwupd-0.9.6-orig/po/make-images.sh fwupd-0.9.6/po/make-images.sh install: true,
--- fwupd-0.9.6-orig/po/make-images.sh 2017-08-03 05:45:02.000000000 -0400 - install_dir: join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d'),
+++ fwupd-0.9.6/po/make-images.sh 2017-09-02 19:58:37.328596570 -0400 + install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
)
configure_file(
input : 'vendor.conf',
output : 'vendor.conf',
configuration : con2,
install: true,
- install_dir: join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d'),
+ install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
)
--- a/meson_post_install.sh
+++ b/meson_post_install.sh
@@ -11,6 +11,4 @@
echo 'Updating systemd deps'
mkdir -p ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants
ln -sf ../fwupd-offline-update.service ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants/fwupd-offline-update.service
- echo 'Creating stateful directory'
- mkdir -p ${DESTDIR}${LOCALSTATEDIR}/lib/fwupd
#fi
--- a/po/make-images.sh
+++ b/po/make-images.sh
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
# #
install -m 0755 -d ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/ install -m 0755 -d ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/
@ -89,26 +102,3 @@ diff -Naur fwupd-0.9.6-orig/po/make-images.sh fwupd-0.9.6/po/make-images.sh
for x in ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/*/LC_IMAGES/*.bmp ; do for x in ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/*/LC_IMAGES/*.bmp ; do
gzip -f ${x} gzip -f ${x}
done done
diff -Naur fwupd-0.9.6-orig/src/meson.build fwupd-0.9.6/src/meson.build
--- fwupd-0.9.6-orig/src/meson.build 2017-08-03 05:45:02.000000000 -0400
+++ fwupd-0.9.6/src/meson.build 2017-09-02 19:58:37.329596590 -0400
@@ -24,6 +24,9 @@
polkit,
soup,
sqlite,
+ uuid,
+ libarchive,
+ libgcab
],
link_with : fwupd,
c_args : [
@@ -73,6 +76,9 @@
gpgme,
gpgerror,
valgrind,
+ uuid,
+ libarchive,
+ libgcab
],
link_with : fwupd,
c_args : [