From adfd0910b76183f421cb6875a66a8dd2e38994ca Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Tue, 1 Apr 2014 16:45:09 +0300 Subject: [PATCH] Don't install firmware to /usr/lib/hotplug/firmware /usr/lib/hotplug/firmware is an old location not used since the move from the old hotplug system. We no longer need to support it. No need to keep two copies of the firmware files. Acked-by: Russ Meyerriecks Signed-off-by: Shaun Ruffell --- build_tools/install_firmware | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/build_tools/install_firmware b/build_tools/install_firmware index f60c45a..a8b2907 100755 --- a/build_tools/install_firmware +++ b/build_tools/install_firmware @@ -5,16 +5,14 @@ FIRMWARE_PATTERN=$1 FIRMWARE_VERSION=$2 DESTDIR=$3 +target="$DESTDIR/lib/firmware" -if ! test -f ${DESTDIR}/usr/lib/hotplug/firmware/.${FIRMWARE_PATTERN}-${FIRMWARE_VERSION} || ! test -f ${DESTDIR}/lib/firmware/.${FIRMWARE_PATTERN}-${FIRMWARE_VERSION}; then - echo "Installing ${FIRMWARE_PATTERN}.bin to hotplug firmware directories" +if ! test -f $target/.${FIRMWARE_PATTERN}-${FIRMWARE_VERSION}; then + echo "Installing ${FIRMWARE_PATTERN}.bin to $target" tar --no-same-owner -xf ${FIRMWARE_PATTERN}-${FIRMWARE_VERSION}.tar.gz || exit 1 - install -m 644 ${FIRMWARE_PATTERN}.bin ${DESTDIR}/usr/lib/hotplug/firmware || exit 1 - rm -rf ${DESTDIR}/usr/lib/hotplug/firmware/.${FIRMWARE_PATTERN}-* - touch ${DESTDIR}/usr/lib/hotplug/firmware/.${FIRMWARE_PATTERN}-${FIRMWARE_VERSION} - install -m 644 ${FIRMWARE_PATTERN}.bin ${DESTDIR}/lib/firmware || exit 1 - rm -rf ${DESTDIR}/lib/firmware/.${FIRMWARE_PATTERN}-* - touch ${DESTDIR}/lib/firmware/.${FIRMWARE_PATTERN}-${FIRMWARE_VERSION} + install -m 644 ${FIRMWARE_PATTERN}.bin $target || exit 1 + rm -rf $target/.${FIRMWARE_PATTERN}-* + touch $target/.${FIRMWARE_PATTERN}-${FIRMWARE_VERSION} # Remove the .bin file so that if the version is reverted, it will not # be installed with a non-matching ${FIRMARE_VERSION} file. rm ${FIRMWARE_PATTERN}.bin