From 349bb95ed6663732b3f0d924ee51b9400e400b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 27 Mar 2017 14:29:55 +0200 Subject: [PATCH] add submodules --- .gitmodules | 6 ++++++ Makefile | 10 ++++++++++ dvb-firmware.git | 1 + linux-firmware.git | 1 + 4 files changed, 18 insertions(+) create mode 100644 .gitmodules create mode 160000 dvb-firmware.git create mode 160000 linux-firmware.git diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..5403703 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "linux-firmware.git"] + path = linux-firmware.git + url = ../mirror_linux-firmware +[submodule "dvb-firmware.git"] + path = dvb-firmware.git + url = ../mirror_dvb-firmware diff --git a/Makefile b/Makefile index f6fdd53..76149c2 100644 --- a/Makefile +++ b/Makefile @@ -39,3 +39,13 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README install -d fwdata/DEBIAN sed -e 's/@VERSION@/${FW_VER}-${FW_REL}/' fwdata/DEBIAN/control dpkg-deb --build fwdata ${FW_DEB} + +# upgrade to current master +.PHONY: update_modules +update_modules: submodules + git submodule foreach 'git pull --ff-only origin master' + +# make sure submodules were initialized +.PHONY: submodules +submodules dvb-firmware.git/README linux-firmware.git/WHENCE: + test -f "linux-firmware.git/WHENCE" || git submodule update --init diff --git a/dvb-firmware.git b/dvb-firmware.git new file mode 160000 index 0000000..967e545 --- /dev/null +++ b/dvb-firmware.git @@ -0,0 +1 @@ +Subproject commit 967e54512be77001f09648b2693bf4aa590383a2 diff --git a/linux-firmware.git b/linux-firmware.git new file mode 160000 index 0000000..44d8e8d --- /dev/null +++ b/linux-firmware.git @@ -0,0 +1 @@ +Subproject commit 44d8e8d4fdcdff56e9e21208d4b4aa7cd6962656