Commit 137c86b0 authored by Seth Forshee's avatar Seth Forshee

UBUNTU: [Debian] Use "make install" to install firmware

Upstream linux-firmware has removed symlinks from the source
tree, instead relying on Link: entries in WHENCE to generate the
symlinks at install time. Our current packaging uses rsync to
copy firmware to the install location, thus we do not get the
symlinks.

Rather than reinventing the logic to create the symlinks, use
the support already present in linux-firmware. Replace the rsync
with "make install", which is going to do a better job anyway as
we still seem to end up with some non-firmware files in
/lib/firmware. Also switch installation of files for nic-firmware
and scsi-firmware to use the install location as the source so
so that, if necessary, symlinks will be correctly installed for
those packages.
Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
parent 52f4cbc3
......@@ -23,8 +23,9 @@ build-arch:
build-indep:
firm_dir = $(CURDIR)/debian/linux-firmware/lib/firmware
doc_dir = $(CURDIR)/debian/linux-firmware/usr/share/doc/linux-firmware
dest_dir = $(CURDIR)/debian/linux-firmware
firm_dir = $(dest_dir)/lib/firmware
doc_dir = $(dest_dir)/usr/share/doc/linux-firmware
license_dir = $(doc_dir)/licenses
nic_firm_dir = $(CURDIR)/debian/nic-firmware/lib/firmware
scsi_firm_dir = $(CURDIR)/debian/scsi-firmware/lib/firmware
......@@ -36,17 +37,14 @@ install-indep: build-indep
install -d $(firm_dir)
rsync -a --exclude=WHENCE --exclude=.git --exclude=debian --exclude=fw_source \
--exclude=/Makefile --exclude=check_whence.py --exclude=GPL-[23] \
* $(firm_dir)
find $(firm_dir) -type f -name "LICEN[CS]E*" |xargs rm
make install DESTDIR=$(dest_dir)
for f in $$(cat debian/nic-firmware.lst); do \
install -m644 -D $$f $(nic_firm_dir)/$$f; \
install -m644 -D $(firm_dir)/$$f $(nic_firm_dir)/$$f; \
done
for f in $$(cat debian/scsi-firmware.lst); do \
install -m644 -D $$f $(scsi_firm_dir)/$$f; \
install -m644 -D $(firm_dir)/$$f $(scsi_firm_dir)/$$f; \
done
install -d $(doc_dir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment