From: Jo-Philipp Wich Date: Wed, 13 Apr 2016 13:37:34 +0000 (+0200) Subject: include: remove now unused PACKAGE_SUBDIR variable X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=be575fdc9d7c1c62937877f8564638eb7f4f5166 include: remove now unused PACKAGE_SUBDIR variable Signed-off-by: Jo-Philipp Wich --- diff --git a/include/kernel.mk b/include/kernel.mk index 432e8ce123..a8b0f4a123 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -155,7 +155,6 @@ define KernelPackage DESCRIPTION:=$(DESCRIPTION) EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)) VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE)) - PACKAGE_SUBDIR:=$(if $(FEED),$(FEED),kernel) $(call KernelPackage/$(1)) $(call KernelPackage/$(1)/$(BOARD)) endef diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 09efaa39b8..2896b4c783 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -17,7 +17,6 @@ define Package/Default CONFIGFILE:= SECTION:=opt CATEGORY:=Extra packages - PACKAGE_SUBDIR:=$(FEED) DEPENDS:= MDEPENDS:= CONFLICTS:= diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk index 04584d5b3a..dabeb957c2 100644 --- a/include/package-dumpinfo.mk +++ b/include/package-dumpinfo.mk @@ -52,7 +52,6 @@ $(if $(PKG_LICENSE),License: $(PKG_LICENSE) $(if $(KCONFIG),Kernel-Config: $(KCONFIG) )$(if $(BUILDONLY),Build-Only: $(BUILDONLY) )$(if $(HIDDEN),Hidden: $(HIDDEN) -)$(if $(PACKAGE_SUBDIR),Package-Subdir: $(PACKAGE_SUBDIR) )Description: $(if $(Package/$(1)/description),$(Package/$(1)/description),$(TITLE)) $(if $(URL),$(URL) )$(MAINTAINER)