Merge pull request #11439 from tete1030/fix-runc

runc/containerd: Fix incomplete cleanup in Build/InstallDev
This commit is contained in:
Florian Eckert 2020-02-27 11:58:02 +01:00 committed by GitHub
commit 8d78da73fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=containerd PKG_NAME:=containerd
PKG_VERSION:=1.2.10 PKG_VERSION:=1.2.10
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -68,6 +68,7 @@ endef
# Avoid installing binaries # Avoid installing binaries
define Build/InstallDev define Build/InstallDev
$(call Build/Compile/Default,clean) $(call Build/Compile/Default,clean)
rm -f $(STAMP_BUILT)
$(call GoPackage/Build/InstallDev,$(1)) $(call GoPackage/Build/InstallDev,$(1))
endef endef

View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=runc PKG_NAME:=runc
PKG_VERSION:=1.0.0-rc8+91-3e425f80 PKG_VERSION:=1.0.0-rc8+91-3e425f80
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -72,6 +72,7 @@ endef
# Avoid installing binaries # Avoid installing binaries
define Build/InstallDev define Build/InstallDev
$(call Build/Compile/Default,clean) $(call Build/Compile/Default,clean)
rm -f $(STAMP_BUILT)
$(call GoPackage/Build/InstallDev,$(1)) $(call GoPackage/Build/InstallDev,$(1))
endef endef