janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-03 18:12:28 +00:00
commit 0eaef0c326
59 changed files with 2065 additions and 2032 deletions
Download patch file Download diff file Expand all files Collapse all files

84
make/linux-rpm-build.mk
View file

@ -6,21 +6,21 @@ 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
CUSTOMER ?= jannet
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-$(shell echo $(KERNEL_VERSION) | $(SED) 's/\(2\.6\.[0-9]+\)-..*/\1/')$(KERNEL_PKG_SUFFIX)
UPLOAD_HOST ?= pkg.janware.com
UPLOAD_PATH ?= /srv/dav/pub/packages/$(CUSTOMER)/$(KERNEL_BASE)
UPLOAD_OWNER ?= $(shell whoami)
HOST ?= $(HOSTNAME)
KERNEL_BASE ?= lx-$(HOST)
BOOT_LABEL ?= lx-$(KERNEL_VERSION)-$(RPM_RELEASE)
KERNEL_PKG_SUFFIX ?= .tar.gz
CUSTOMER ?= jannet
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-$(shell echo $(KERNEL_VERSION) | $(SED) 's/\(2\.6\.[0-9]+\)-..*/\1/')$(KERNEL_PKG_SUFFIX)
UPLOAD_HOST ?= pkg.janware.com
UPLOAD_PATH ?= /srv/dav/pub/packages/$(CUSTOMER)/$(KERNEL_BASE)
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 = $(KERNEL_DLOAD_DIR)/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar
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 = $(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
@ -34,56 +34,56 @@ else
KERNEL_PKG = $(KERNEL_PKG_BASE).bz2
KERNEL_SRC_DIR = linux-$(KERNEL_VERSION)
endif
#HOST = $(shell cd ../..; $(PWD) | xargs basename)
WD := $(shell $(PWD))
TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g')
ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g')
#HOST = $(shell cd ../..; $(PWD) | xargs basename)
WD := $(shell $(PWD))
TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g')
ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g')
RPMBUILD = $(shell which rpmbuild 2>/dev/null)
RPMBUILD = $(shell which rpmbuild 2>/dev/null)
ifeq ($(RPMBUILD),)
RPMBUILD = $(shell which rpm 2>/dev/null)
RPMBUILD = $(shell which rpm 2>/dev/null)
endif
#ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),)
#RPM_RELEASE := $(shell make newrelease; exit 1)
#RPM_RELEASE := $(shell make newrelease; exit 1)
#else
#RPM_RELEASE_NUM := $(strip $(shell grep Id: RELEASE-$(KERNEL_VERSION) | $(SED) "s/.*RELEASE-$(KERNEL_VERSION),v[ ]*[0-9]*\.\([0-9]*\)[^0-9]*.*/\1/"))
#RPM_RELEASE_NUM := $(strip $(shell grep Id: RELEASE-$(KERNEL_VERSION) | $(SED) "s/.*RELEASE-$(KERNEL_VERSION),v[ ]*[0-9]*\.\([0-9]*\)[^0-9]*.*/\1/"))
#ifeq ($(UNAME_SUFFIX),)
#RPM_RELEASE = $(RPM_RELEASE_NUM)
#RPM_RELEASE = $(RPM_RELEASE_NUM)
#else
#RPM_RELEASE = $(UNAME_SUFFIX)$(RPM_RELEASE_NUM)
#RPM_RELEASE = $(UNAME_SUFFIX)$(RPM_RELEASE_NUM)
#endif
#endif
BASE = $(KERNEL_BASE)-$(COMPLETE_VERSION)
TMP_INSTALL = $(KERNEL_BASE)-$(COMPLETE_VERSION)
BASE_RUN = $(KERNEL_BASE)-run-$(COMPLETE_VERSION)
BASE_DEVEL = $(KERNEL_BASE)-devel-$(COMPLETE_VERSION)
BASE = $(KERNEL_BASE)-$(COMPLETE_VERSION)
TMP_INSTALL = $(KERNEL_BASE)-$(COMPLETE_VERSION)
BASE_RUN = $(KERNEL_BASE)-run-$(COMPLETE_VERSION)
BASE_DEVEL = $(KERNEL_BASE)-devel-$(COMPLETE_VERSION)
ifeq ($(BOOT_LABEL),)
BOOT_LABEL = lx-$(COMPLETE_VERSION)
BOOT_LABEL = lx-$(COMPLETE_VERSION)
endif
KERNEL_TGZ = $(notdir $(KERNEL_PKG))
F_SPEC = $(BASE).spec
F_TGZ = $(BASE).tar.gz
F_SPM = $(BASE).src.rpm
F_RPM_RUN = $(BASE_RUN).$(ARCH).rpm
F_RPM_DEVEL = $(BASE_DEVEL).$(ARCH).rpm
F_RPMS = $(F_RPM_RUN) $(F_RPM_DEVEL)
F_BOOTFILES = $(addsuffix -$(COMPLETE_VERSION),$(addprefix $(TMP_INSTALL)/boot/,vmlinuz config System.map))
F_CURRENT = $(addprefix CURRENT_, SRC RPM_SRC RPM_RUN_I386 RPM_DEVEL_I386)
F_ULDONE = $(addsuffix .uldone,$(F_RPMS) $(F_TGZ) $(F_SPM) current)
KERNEL_TGZ = $(notdir $(KERNEL_PKG))
F_SPEC = $(BASE).spec
F_TGZ = $(BASE).tar.gz
F_SPM = $(BASE).src.rpm
F_RPM_RUN = $(BASE_RUN).$(ARCH).rpm
F_RPM_DEVEL = $(BASE_DEVEL).$(ARCH).rpm
F_RPMS = $(F_RPM_RUN) $(F_RPM_DEVEL)
F_BOOTFILES = $(addsuffix -$(COMPLETE_VERSION),$(addprefix $(TMP_INSTALL)/boot/,vmlinuz config System.map))
F_CURRENT = $(addprefix CURRENT_, SRC RPM_SRC RPM_RUN_I386 RPM_DEVEL_I386)
F_ULDONE = $(addsuffix .uldone,$(F_RPMS) $(F_TGZ) $(F_SPM) current)
# note that order matters for F_ULDONE and F_RPMS (remote directory attributes)
KERNEL_INSTALL_PREFIX= $(shell pwd)/$(TMP_INSTALL)
KERNEL_INSTALL_PREFIX = $(shell pwd)/$(TMP_INSTALL)
BUILD = sh $(MODDIR)/devutil/jcs/build_linux.sh \
BUILD = sh $(MODDIR)/devutil/jcs/build_linux.sh \
-c config-$(KERNEL_VERSION) \
-t $(HOST) \
-b $(WD) \
-a i386 \
-s $(KERNEL_SRC_DIR) \
-i $(TMP_INSTALL)
MKSPEC := $(MODDIR)/devutil/jcs/mkspec-linux.sh
MKSPEC := $(MODDIR)/devutil/jcs/mkspec-linux.sh
# exports
export KERNEL_VERSION