From 346729dd0519663176bd4aa3d62a4e3782faa5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= Date: Tue, 23 May 2017 18:23:16 -0400 Subject: [PATCH] Create /lib/firmware/updates as a link to /var/lib/firmware MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will provide the user a place to drop firmware files needed by the kernel. In the future (compat level >= 10) we'll want to move debian/tmpfiles/linux-firmware.conf to debian/linux-firmware.tmpfile, so it will be automatically installed by dh_installinit, and we can drop debian/linux-firmware.install. Signed-off-by: João Paulo Rechi Vita https://phabricator.endlessm.com/T12154 --- debian/linux-firmware.install | 1 + debian/linux-firmware.links | 1 + debian/linux-firmware.postrm | 12 ++++++++++++ debian/rules | 2 ++ debian/tmpfiles/linux-firmware.conf | 1 + 5 files changed, 17 insertions(+) create mode 100644 debian/linux-firmware.install create mode 100644 debian/linux-firmware.links create mode 100755 debian/linux-firmware.postrm create mode 100644 debian/tmpfiles/linux-firmware.conf diff --git a/debian/linux-firmware.install b/debian/linux-firmware.install new file mode 100644 index 0000000..ec920c0 --- /dev/null +++ b/debian/linux-firmware.install @@ -0,0 +1 @@ +debian/tmpfiles/* /usr/lib/tmpfiles.d/ diff --git a/debian/linux-firmware.links b/debian/linux-firmware.links new file mode 100644 index 0000000..2cfffbd --- /dev/null +++ b/debian/linux-firmware.links @@ -0,0 +1 @@ +/var/lib/firmware /lib/firmware/updates diff --git a/debian/linux-firmware.postrm b/debian/linux-firmware.postrm new file mode 100755 index 0000000..5f415e2 --- /dev/null +++ b/debian/linux-firmware.postrm @@ -0,0 +1,12 @@ +#!/bin/sh + +# Remove directory created by linux-firmware.conf tmpfiles.d entry, +# except if it contains user-installed files. +DIR="/var/lib/firmware" +if [ -d ${DIR} ]; then + if [ -z "$(ls -A ${DIR})" ]; then + rmdir ${DIR} + else + echo "${DIR} is not empty, not removing" + fi +fi diff --git a/debian/rules b/debian/rules index 0cba4bd..95d1a70 100755 --- a/debian/rules +++ b/debian/rules @@ -57,8 +57,10 @@ binary-indep: install-indep dh_testdir dh_testroot + dh_link -i dh_installchangelogs -i dh_installdocs -i + dh_install -i --fail-missing dh_compress -i dh_fixperms -i dh_installdeb -i diff --git a/debian/tmpfiles/linux-firmware.conf b/debian/tmpfiles/linux-firmware.conf new file mode 100644 index 0000000..87856e1 --- /dev/null +++ b/debian/tmpfiles/linux-firmware.conf @@ -0,0 +1 @@ +d /var/lib/firmware 0755 - - - -- 2.22.0