From 9cd5ef2b98406b3628b1a1f05d9c267ba2d564f5 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 16 Mar 2026 10:23:20 +0100 Subject: [PATCH] upload-defs-rpm.mk: Remove upload-defs-rpm.mk doesn't contain anything useful, remove it. Signed-off-by: Jan Lindemann --- make/rpmdist.mk | 2 -- make/upload-defs-rpm.mk | 45 ----------------------------------------- 2 files changed, 47 deletions(-) delete mode 100644 make/upload-defs-rpm.mk diff --git a/make/rpmdist.mk b/make/rpmdist.mk index bbbadd61..256e3038 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -62,8 +62,6 @@ else PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm endif -include $(JWBDIR)/make/upload-defs-rpm.mk - DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g') GENERATED = $(sort $(shell find . -name '*.in' | \ $(SED) "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%")) diff --git a/make/upload-defs-rpm.mk b/make/upload-defs-rpm.mk deleted file mode 100644 index ccbb2596..00000000 --- a/make/upload-defs-rpm.mk +++ /dev/null @@ -1,45 +0,0 @@ -# this makefile needs -# PCKG_ROOT -# VERSION -# JWB_SCRIPT_DIR - -#UPLOAD_SH = $(JWB_SCRIPT_DIR)/upload.sh -#MKSPEC_SH = $(JWB_SCRIPT_DIR)/mkspec-wrapper.sh $(TOPDIR)/make/mkspec.sh - -#FTP_FILE_MODE ?= 640 -#FTP_DIR_MODE ?= 750 -#FTP_SRC_GROUP ?= spidsrc -#FTP_SRC_USER ?= $(shell whoami) -#FTP_RUN_GROUP ?= spidrun -#FTP_RUN_USER ?= $(shell whoami) -#FTP_DEV_GROUP ?= spiddev -#FTP_DEV_USER ?= $(shell whoami) -#FTP_HOST ?= pkg.janware.com -#FTP_HOST_LOGIN ?= root -# -#OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//') -#OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//') -# -## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/rpm/src -#FTP_PCKG_DIR ?= /pub/packages -#PCKG_ROOT ?= $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION) -##PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT) -#CURRENT_SRC = $(warning PCKG_ROOT=$(PCKG_ROOT))$(PCKG_ROOT)/tgz/$(PCKG_TAR) -#CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_RUN_I386) -#CURRENT_RPM_DEVEL_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_DEVEL_I386) -#CURRENT_RPM_SRC = $(PCKG_ROOT)/src/$(PCKG_RPM_SRC) -#REMOTE_TARGET_PREFIX = rsync_ssh://$(FTP_HOST_LOGIN)@$(FTP_HOST):/srv/ftp -#REMOTE_TARGETS = \ -# $(REMOTE_TARGET_PREFIX)$(CURRENT_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \ -# $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_RUN_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_RUN_USER).$(FTP_RUN_GROUP)\ -# $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) -# -#ifeq ($(CREATE_DEVEL),true) -#REMOTE_TARGETS += \ -# $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP) -#endif - -# $(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_SRC:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \ -# $(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_SRC:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) -# $(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_RUN_I386:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_RUN_USER).$(FTP_RUN_GROUP) \ -# $(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_DEVEL_I386:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP)