From 79bfa1e66dbc9105ca90bf41a7339585f351940b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 13 Oct 2017 08:30:09 +0200 Subject: [PATCH] build: rename submodules target to submodule (cherry picked from commit a6dd515e43404ec4e4e7b5fa267ad335bf58dedc) --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e1463e7..164846d 100644 --- a/Makefile +++ b/Makefile @@ -232,7 +232,7 @@ PVE_CONFIG_OPTS= \ touch $@ ${KERNEL_CFG_ORG}: ${KERNEL_SRC}/README -${KERNEL_SRC}/README: ${KERNEL_SRC_SUBMODULE} | submodules +${KERNEL_SRC}/README: ${KERNEL_SRC_SUBMODULE} | submodule rm -rf ${KERNEL_SRC} cp -a ${KERNEL_SRC_SUBMODULE} ${KERNEL_SRC} cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG} @@ -346,12 +346,12 @@ distclean: clean # upgrade to current master .PHONY: update_modules -update_modules: submodules +update_modules: submodule git submodule foreach 'git pull --ff-only origin master' # make sure submodules were initialized -.PHONY: submodules -submodules: +.PHONY: submodule +submodule: test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init test -f "${ZFSSRC}/debian/changelog" || git submodule update --init test -f "${SPLSRC}/debian/changelog" || git submodule update --init -- 2.39.2