ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-09 12:21:33 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fixes uapi helper define

Browse Source 
SVN-Revision: 34715
This commit is contained in:
John Crispin 2012-12-16 11:04:27 +00:00
parent 7bcb6b5479
commit e9c0b95829
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/kernel.mk
View File

@ -35,8 +35,9 @@ else
endif endif
KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)) KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))
LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
LINUX_UAPI_DIR=$(firstword $(wildcard $(LINUX_DIR)/include/uapi $(LINUX_DIR)/include)) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
LINUX_UAPI_DIR=uapi/
endif
LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null)) LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null))
LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown) LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown)

2
package/network/services/ppp/Makefile
View File

@ -158,7 +158,7 @@ $(call Build/Configure/Default,, \
mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux
cp \ cp \
$(LINUX_DIR)/include/linux/compiler.h \ $(LINUX_DIR)/include/linux/compiler.h \
$(LINUX_UAPI_DIR)/linux/atm*.h \ $(LINUX_DIR)/include/$(LINUX_UAPI_DIR)linux/atm*.h \
$(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/ $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
endef endef