Bug#863822: Use debhelper's meson support
> -----Original Message-----
> From: Iain Lane [mailto:laney@debian.org]
> Sent: Wednesday, May 31, 2017 9:29 AM
> To: Debian Bug Tracking System <submit@bugs.debian.org>
> Subject: Bug#863822: Use debhelper's meson support
>
> Package: src:fwupd
> Version: 0.9.2-5
> Severity: minor
> Tags: patch
>
> Hiya,
>
> [ looks like -5 and the tags aren't pushed to git; I did gbp import-dsc
> to generate this patch ]
>
> Since fwupd BDs on experimental's debhelper, we can make use of its
> meson build system support. The attached patch does that. I debdiffed
> the binaries, and it says this:
>
> laney@artful> debdiff fwupd_0.9.2-5_amd64.changes fwupd_0.9.2-
> 5ubuntu1_amd64.changes
> ~/temp
> [The following lists of changes regard files as different if they have
> different names, permissions or owners.]
>
> Files in second .changes but not in first
> -----------------------------------------
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/01/3af5051e01f609d88a24c2a98b410b629caa81.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/08/e84eda01a60a0923123122ef866c2bca69c2d5.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/2c/5725d679a4ef2f8cd150ea2bd4d93a443e2069.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/47/b385eca94e521556da88fdc2942cc11c20ea86.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/48/9b60ef7c7eee7230bb06a34bda2ff19c8d2efc.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/5e/f6f628331b4924f82c93c92005f907f336e7e9.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/6b/8d5d642c972ef6297d4b071aa766a670599332.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/85/704afcd78cc7f548f7fa8d1c8eba062ff24822.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/88/1da077ad1eb160f20eab129062004de744fbb8.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/b5/0365171bc84e47f219c2157c1f5465bda60c81.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/bc/4d2c8e8105c10e6c9d10e4d47179ae43aaec8f.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/cb/1fbdc6628066b3c900752afe5a871a163a47b7.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/d9/a33254896af181f436dfba8387e928425e237b.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/ea/c0dbf7e27c954bdf648633783113d4acf9584b.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/ec/78c8d16608691eb205c923a0eaead4a7a57b60.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/f3/d1d3593e951d6d0f095bd699a89bbf8e58f91e.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/ff/6f16ec8c2f28839ac6bedf70e3d538b7afe52d.debug
> -rwxr-xr-x root/root /usr/lib/x86_64-linux-gnu/fwupd/fwupd
>
> Files in first .changes but not in second
> -----------------------------------------
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/19/42ec06f23beac06ce3bc8bd88006d56e793f29.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/28/1c986adedadb6e25ca48aaa142b6d0fe8ab3d0.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/34/ddcb7ccf309d16d0903bfa9211be8dc17dcf04.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/43/861873324603e449bca099b1234346ed5502bb.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/48/69c61fc9c276012f66bf89ae17d0e44aa37b4e.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/5b/e12253d8834f87e263de8b55e980002b3a1de5.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/74/de05561d2293576300057d9fa654b3d68abfc3.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/79/fb0dbb9e8a6fb0b379edca7145769cca30bc1f.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/83/8667ba1ebf332f290f62507670d844884fef13.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/87/37cd721633ab03418bf6e66c889ada8f079576.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/89/be5d81f611c7c5799f445210d450da67f86d03.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/91/025839a49b3b3c20f5becbf799da56863a6cd3.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/93/7d81336efacb1619e4ebbbe3b2b0b5031fff37.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/a4/a8d3cbbd15e4306b9e84138d79cde2ee6c954d.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/b3/3f4a2dd1475e6c38124f5d9158c5bb007a076e.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/ba/1c06d2a6a6c363b31f0296c779a7b18ada5d9d.debug
> -rw-r--r-- root/root /usr/lib/debug/.build-
> id/de/aa5bf15cac0d0f7a398a65097f8b9e7867d59f.debug
> -rwxr-xr-x root/root /usr/lib/fwupd/fwupd
>
> Control files of package fwupd: lines which differ (wdiff format)
> -----------------------------------------------------------------
> Version: [-0.9.2-5-] {+0.9.2-5ubuntu1+}
>
> Control files of package fwupd-dbgsym: lines which differ (wdiff format)
> ------------------------------------------------------------------------
> Build-Ids: [-1942ec06f23beac06ce3bc8bd88006d56e793f29
> 281c986adedadb6e25ca48aaa142b6d0fe8ab3d0
> 34ddcb7ccf309d16d0903bfa9211be8dc17dcf04
> 43861873324603e449bca099b1234346ed5502bb
> 4869c61fc9c276012f66bf89ae17d0e44aa37b4e
> 5be12253d8834f87e263de8b55e980002b3a1de5
> 74de05561d2293576300057d9fa654b3d68abfc3
> 79fb0dbb9e8a6fb0b379edca7145769cca30bc1f
> 838667ba1ebf332f290f62507670d844884fef13
> 89be5d81f611c7c5799f445210d450da67f86d03
> 91025839a49b3b3c20f5becbf799da56863a6cd3
> 937d81336efacb1619e4ebbbe3b2b0b5031fff37
> b33f4a2dd1475e6c38124f5d9158c5bb007a076e
> ba1c06d2a6a6c363b31f0296c779a7b18ada5d9d
> deaa5bf15cac0d0f7a398a65097f8b9e7867d59f-]
> {+08e84eda01a60a0923123122ef866c2bca69c2d5
> 2c5725d679a4ef2f8cd150ea2bd4d93a443e2069
> 47b385eca94e521556da88fdc2942cc11c20ea86
> 489b60ef7c7eee7230bb06a34bda2ff19c8d2efc
> 5ef6f628331b4924f82c93c92005f907f336e7e9
> 6b8d5d642c972ef6297d4b071aa766a670599332
> 85704afcd78cc7f548f7fa8d1c8eba062ff24822
> b50365171bc84e47f219c2157c1f5465bda60c81
> bc4d2c8e8105c10e6c9d10e4d47179ae43aa
> ec8f cb1fbdc6628066b3c900752afe5a871a163a47b7
> d9a33254896af181f436dfba8387e928425e237b
> eac0dbf7e27c954bdf648633783113d4acf9584b
> ec78c8d16608691eb205c923a0eaead4a7a57b60
> f3d1d3593e951d6d0f095bd699a89bbf8e58f91e
> ff6f16ec8c2f28839ac6bedf70e3d538b7afe52d+}
> Depends: fwupd (= [-0.9.2-5)-] {+0.9.2-5ubuntu1)+}
> Version: [-0.9.2-5-] {+0.9.2-5ubuntu1+}
>
> Control files of package gir1.2-fwupd-1.0: lines which differ (wdiff format)
> ----------------------------------------------------------------------------
> Version: [-0.9.2-5-] {+0.9.2-5ubuntu1+}
>
> Control files of package libdfu-dev: lines which differ (wdiff format)
> ----------------------------------------------------------------------
> Depends: libdfu1 (= [-0.9.2-5)-] {+0.9.2-5ubuntu1)+}
> Version: [-0.9.2-5-] {+0.9.2-5ubuntu1+}
>
> Control files of package libdfu1: lines which differ (wdiff format)
> -------------------------------------------------------------------
> Version: [-0.9.2-5-] {+0.9.2-5ubuntu1+}
>
> Control files of package libdfu1-dbgsym: lines which differ (wdiff format)
> --------------------------------------------------------------------------
> Build-Ids: [-a4a8d3cbbd15e4306b9e84138d79cde2ee6c954d-]
> {+881da077ad1eb160f20eab129062004de744fbb8+}
> Depends: libdfu1 (= [-0.9.2-5)-] {+0.9.2-5ubuntu1)+}
> Version: [-0.9.2-5-] {+0.9.2-5ubuntu1+}
>
> Control files of package libebitdo-dev: lines which differ (wdiff format)
> -------------------------------------------------------------------------
> Version: [-0.9.2-5-] {+0.9.2-5ubuntu1+}
>
> Control files of package libebitdo1: lines which differ (wdiff format)
> ----------------------------------------------------------------------
> Version: [-0.9.2-5-] {+0.9.2-5ubuntu1+}
>
> Control files of package libfwupd-dev: lines which differ (wdiff format)
> ------------------------------------------------------------------------
> Depends: libfwupd1 (= [-0.9.2-5),-] {+0.9.2-5ubuntu1),+} gir1.2-fwupd-1.0 (= [-
> 0.9.2-5)-] {+0.9.2-5ubuntu1)+}
> Version: [-0.9.2-5-] {+0.9.2-5ubuntu1+}
>
> Control files of package libfwupd1: lines which differ (wdiff format)
> ---------------------------------------------------------------------
> Version: [-0.9.2-5-] {+0.9.2-5ubuntu1+}
>
> Control files of package libfwupd1-dbgsym: lines which differ (wdiff format)
> ----------------------------------------------------------------------------
> Build-Ids: [-8737cd721633ab03418bf6e66c889ada8f079576-]
> {+013af5051e01f609d88a24c2a98b410b629caa81+}
> Depends: libfwupd1 (= [-0.9.2-5)-] {+0.9.2-5ubuntu1)+}
> Version: [-0.9.2-5-] {+0.9.2-5ubuntu1+}
>
> So the only interesting change is that it makes the libdir multiarch. That
> seems to be okay:
>
> laney@artful> dpkg --fsys-tarfile fwupd_0.9.2-5ubuntu1_amd64.deb | tar xO-
> ./lib/systemd/system/fwupd.service
> [Unit]
> Description=Firmware update daemon
> Documentation=http://www.fwupd.org/
> After=dbus.service
> Before=gdm.service
>
> [Service]
> Type=dbus
> BusName=org.freedesktop.fwupd
> ExecStart=/usr/lib/x86_64-linux-gnu/fwupd/fwupd
> MemoryDenyWriteExecute=yes
> PrivateTmp=yes
> ProtectControlGroups=yes
> ProtectHome=yes
> ProtectKernelModules=yes
> ProtectSystem=full
> RestrictAddressFamilies=AF_NETLINK AF_UNIX
> RestrictRealtime=yes
> ReadWritePaths=/var/lib/fwupd -/boot/efi
> laney@artful> dpkg --fsys-tarfile fwupd_0.9.2-5ubuntu1_amd64.deb | tar xO-
> ./usr/share/dbus-1/system-services/org.freedesktop.fwupd.service
> [D-BUS Service]
> Name=org.freedesktop.fwupd
> Documentation=http://www.fwupd.org/
> Exec=/usr/lib/x86_64-linux-gnu/fwupd/fwupd
> User=root
> SystemdService=fwupd.service
>
> both of these reference the right path.
>
> Cheers,
>
> --
> Iain Lane [ iain@orangesquash.org.uk ]
> Debian Developer [ laney@debian.org ]
> Ubuntu Developer [ laney@ubuntu.com ]
Oh cool! Thanks for the diff (and the reminder I forgot to push).
The multiarch thing for the daemon is not desirable actually.
There was another issue opened up talking about how this daemon doesn't make sense to have it's own multiarch path.
I'll see if I can find a way to override just that bit.
Reply to: