From 16242a994250c27ed4e41d5a2d6e711b706e0067 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 13 Jul 2008 15:03:04 +0000 Subject: [PATCH] linux-rpm-build.mk, linux-rpm.mk: Merged changes from V_1_1_15_4_ITALY --- make/linux-rpm-build.mk | 1 + make/linux-rpm.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/make/linux-rpm-build.mk b/make/linux-rpm-build.mk index d221e45b..1993c7e6 100644 --- a/make/linux-rpm-build.mk +++ b/make/linux-rpm-build.mk @@ -6,6 +6,7 @@ define COMPLETE_VERSION $(shell cat COMPLETE_VERSION) endef +HOST ?= $(HOSTNAME) KERNEL_BASE ?= lx-$(HOST) BOOT_LABEL ?= lx-$(KERNEL_VERSION)-$(RPM_RELEASE) KERNEL_PKG_SUFFIX ?= .tar.gz diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk index b8dc66e4..3996a458 100644 --- a/make/linux-rpm.mk +++ b/make/linux-rpm.mk @@ -12,6 +12,7 @@ KERNEL_RELEASE = $(shell echo $(KERNEL_VERSION) | cut -d\. -f3) KERNEL_DLOAD_DIR ?= /home/samba/dat/share/exe/linux/os KERNEL_PKG_BASE = $(KERNEL_DLOAD_DIR)/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar LINUX_KERNEL_PATCH_DIR ?= $(CVS_ROOT_DIR)/conf/jannet.de/all/lx-patches +HOST ?= $(HOSTNAME) ifneq ($(wildcard $(KERNEL_PKG_BASE).*),) ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),)