linux-rpm-build.mk, linux-rpm.mk: Make KERNEL_DLOAD_DIR specifiable from Makefile

This commit is contained in:
Jan Lindemann 2006-06-27 00:53:58 +00:00 committed by Jan Lindemann
commit 3f08e0730f
2 changed files with 5 additions and 4 deletions

View file

@ -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

View file

@ -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),)