diff --git a/make/linux-rpm-build.mk b/make/linux-rpm-build.mk index daeccd20..aa0fcd9a 100644 --- a/make/linux-rpm-build.mk +++ b/make/linux-rpm-build.mk @@ -10,8 +10,8 @@ KERNEL_BASE ?= lx-$(HOST) BOOT_LABEL ?= lx-$(KERNEL_VERSION)-$(RPM_RELEASE) KERNEL_PKG_SUFFIX ?= .tar.gz CUSTOMER ?= jannet -KERNEL_BASE_DIR ?= /home/samba/dat/exe/linux/os -KERNEL_PKG ?= $(KERNEL_BASE_DIR)/$(shell echo $(KERNEL_VERSION) | sed 's/\([0-9]\.[0-9]*\)\..*/\1/')/linux-$(KERNEL_VERSION)$(KERNEL_PKG_SUFFIX) +KERNEL_DLOAD_DIR ?= /home/samba/dat/exe/linux/os +KERNEL_PKG ?= $(KERNEL_DLOAD_DIR)/$(shell echo $(KERNEL_VERSION) | sed 's/\([0-9]\.[0-9]*\)\..*/\1/')/linux-$(KERNEL_VERSION)$(KERNEL_PKG_SUFFIX) UPLOAD_HOST ?= ftp.jannet.de UPLOAD_PATH ?= /home/ftp/dat/pub/packages/$(CUSTOMER)/$(KERNEL_BASE) UPLOAD_OWNER ?= $(shell whoami) @@ -19,7 +19,7 @@ UPLOAD_OWNER ?= $(shell whoami) KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) KERNEL_MINOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f2) KERNEL_RELEASE = $(shell echo $(KERNEL_VERSION) | cut -d\. -f3) -KERNEL_PKG_BASE = /home/samba/dat/share/exe/linux/os/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar +KERNEL_PKG_BASE = $(KERNEL_DLOAD_DIR)/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar ifneq ($(wildcard $(KERNEL_PKG_BASE).*),) ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),) KERNEL_PKG = $(KERNEL_PKG_BASE).gz diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk index fd323023..3e6a727b 100644 --- a/make/linux-rpm.mk +++ b/make/linux-rpm.mk @@ -9,7 +9,8 @@ endef KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) KERNEL_MINOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f2) KERNEL_RELEASE = $(shell echo $(KERNEL_VERSION) | cut -d\. -f3) -KERNEL_PKG_BASE = /home/samba/dat/share/exe/linux/os/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar +KERNEL_DLOAD_DIR ?= /home/samba/dat/share/exe/linux/os +KERNEL_PKG_BASE = $(KERNEL_DLOAD_DIR)/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar ifneq ($(wildcard $(KERNEL_PKG_BASE).*),) ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),)