mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
make: Replace sed by $(SED)
This commit is contained in:
Jan Lindemann
parent
6f7bc019a9
commit
9f4e02e618
18 changed files with 80 additions and 77 deletions
|
|
@ -24,7 +24,7 @@ confclean:
|
|||
rm -rf $(DISTCLEAN) $(CLEAN) $(AC_FILES) autom4te.cache
|
||||
|
||||
configure.ac: configure.ac.tmpl VERSION
|
||||
cat $< | sed -e "s/_VERSION_/`cat VERSION | sed 's/-dev//'`/" > $@
|
||||
cat $< | $(SED) -e "s/_VERSION_/`cat VERSION | $(SED) 's/-dev//'`/" > $@
|
||||
|
||||
configure: configure.ac
|
||||
autoconf $< > $@
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
CORE_DUMPER = $(shell echo -e "quit" | gdb --core=$(CORE) 2>&1 | \
|
||||
sed '/Core was generated/ !d; s/Core was generated by `//; s/ .*//' | xargs -r which)
|
||||
$(SED) '/Core was generated/ !d; s/Core was generated by `//; s/ .*//' | xargs -r which)
|
||||
ifeq ($(CORE_DUMPER),)
|
||||
CORE_DUMPER = $(EXE_PATH)
|
||||
endif
|
||||
|
||||
PID = $(shell ps aux | sed "/$(notdir $(EXE_PATH))/ !d; /sed/ d" | awk '{print $$2}')
|
||||
PID = $(shell ps aux | $(SED) "/$(notdir $(EXE_PATH))/ !d; /$(SED)/ d" | awk '{print $$2}')
|
||||
|
||||
all:
|
||||
|
||||
|
|
|
|||
51
make/defs.mk
51
make/defs.mk
|
|
@ -30,26 +30,29 @@ FLAVOUR_PATH_PREFIX ?= win32/
|
|||
FLAVOUR_PATH_SUFFIX ?= /win32
|
||||
endif
|
||||
|
||||
# ----- executables
|
||||
SED = /usr/bin/sed
|
||||
|
||||
PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/doc/share/project.txt)
|
||||
PROJECT ?= $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | sed 's/.*\///; s/-[0-9].*//')))
|
||||
PROJECT ?= $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//')))
|
||||
PROJECT_SHORT_NAME ?= $(PROJECT)
|
||||
PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | sed 's/-/_/g')
|
||||
PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g')
|
||||
PROJECT_DESCR ?= No description
|
||||
CUSTOMER ?= jannet
|
||||
|
||||
VERSION_FILE ?= $(firstword $(wildcard VERSION $(TOPDIR)/VERSION))
|
||||
VERSION ?= $(shell cat $(VERSION_FILE))
|
||||
DIST_VERSION ?= $(shell sed -e "s/-dev//" $(VERSION_FILE))
|
||||
DIST_VERSION ?= $(shell $(SED) -e "s/-dev//" $(VERSION_FILE))
|
||||
HEX_VERSION = $(shell echo $(DIST_VERSION) | \
|
||||
sed 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x")
|
||||
BINARY_VERSION = $(shell echo $(PROJECT)_$(DIST_VERSION) | tr [a-z] [A-Z] | sed 's/-[^-]*$$//; s/-/_/g')
|
||||
WINVERSION = $(shell echo $(VERSION) | sed -e "s/\./_/g")
|
||||
$(SED) 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x")
|
||||
BINARY_VERSION = $(shell echo $(PROJECT)_$(DIST_VERSION) | tr [a-z] [A-Z] | $(SED) 's/-[^-]*$$//; s/-/_/g')
|
||||
WINVERSION = $(shell echo $(VERSION) | $(SED) -e "s/\./_/g")
|
||||
LOCAL_VERSION = $(shell echo $(VERSION))
|
||||
LOCAL_WINVERSION = $(shell echo $(VERSION) | sed -e "s/\./_/g")
|
||||
DIST_VERSION = $(shell echo $(VERSION) | sed -e "s/-dev//")
|
||||
DIST_WINVERSION = $(shell echo $(WINVERSION) | sed -e "s/-dev//")
|
||||
LOCAL_DIST_VERSION = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//")
|
||||
LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
|
||||
LOCAL_WINVERSION = $(shell echo $(VERSION) | $(SED) -e "s/\./_/g")
|
||||
DIST_VERSION = $(shell echo $(VERSION) | $(SED) -e "s/-dev//")
|
||||
DIST_WINVERSION = $(shell echo $(WINVERSION) | $(SED) -e "s/-dev//")
|
||||
LOCAL_DIST_VERSION = $(shell echo $(LOCAL_VERSION) | $(SED) -e "s/-dev//")
|
||||
LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | $(SED) -e "s/-dev//")
|
||||
MAJOR_MINOR_RELEASE = $(shell echo $(DIST_VERSION) | cut -d- -f1)
|
||||
MAJOR_VERSION = $(shell echo $(MAJOR_MINOR_RELEASE) | cut -d. -f1)
|
||||
MINOR_VERSION = $(shell echo $(MAJOR_MINOR_RELEASE) | cut -d. -f2)
|
||||
|
|
@ -71,7 +74,7 @@ MOD_SCRIPT_DIR ?= $(firstword $(wildcard $(MODDIR)/devutil/scripts $(MODD
|
|||
endif
|
||||
YTOOLS_DIR = $(MODDIR)
|
||||
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
|
||||
CVS_ROOT_DIR = $(shell test -d CVS && pwd | sed -e "s%`cat CVS/Repository`%%; s%/$$%%")
|
||||
CVS_ROOT_DIR = $(shell test -d CVS && pwd | $(SED) -e "s%`cat CVS/Repository`%%; s%/$$%%")
|
||||
REV_SUBDIRS = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}')
|
||||
FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh
|
||||
IMAGE_DIR ?= $(CVS_ROOT_DIR)/images
|
||||
|
|
@ -113,8 +116,8 @@ else
|
|||
endif
|
||||
endif
|
||||
|
||||
CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions -DPROJECT_STR=\"$(PROJECT)\"
|
||||
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\"
|
||||
CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unu$(SED)-value -fexceptions -DPROJECT_STR=\"$(PROJECT)\"
|
||||
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unu$(SED)-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\"
|
||||
LDFLAGS += -Wall
|
||||
|
||||
ifneq ($(LOG_QUAL_PREFIX),)
|
||||
|
|
@ -171,7 +174,7 @@ GCC_MAJOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,
|
|||
GCC_MINOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[2];}')
|
||||
GCC_REV = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[3];}')
|
||||
|
||||
LD_VERSION = $(shell ld -V | sed '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//')
|
||||
LD_VERSION = $(shell ld -V | $(SED) '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//')
|
||||
LD_MAJOR = $(shell echo $(LD_VERSION) | cut -d. -f1)
|
||||
LD_MINOR = $(shell echo $(LD_VERSION) | cut -d. -f2)
|
||||
LD_REV = $(shell echo $(LD_VERSION) | cut -d. -f3)
|
||||
|
|
@ -181,7 +184,7 @@ UPDATE_REPO_SH = /opt/packager-server/bin/packager-server schedule-rebui
|
|||
|
||||
SRC_SUFFIX += $(sort $(suffix $(wildcard $(TOPDIR)/hdr/*)))
|
||||
LOCAL_SRC += Makefile $(wildcard $(addprefix *,$(SRC_SUFFIX)))
|
||||
SRC_HEADERED += $(shell if [ "$(LOCAL_SRC)" ]; then grep -ic "it services" $(LOCAL_SRC) | sed '/:0$$/ d; s/:.*$$//'; fi)
|
||||
SRC_HEADERED += $(shell if [ "$(LOCAL_SRC)" ]; then grep -ic "it services" $(LOCAL_SRC) | $(SED) '/:0$$/ d; s/:.*$$//'; fi)
|
||||
SRC_UNHEADERED += $(filter-out $(SRC_HEADERED),$(LOCAL_SRC))
|
||||
LOCAL_C += $(wildcard *.c)
|
||||
LOCAL_CPP += $(wildcard *.cc *.cpp *.C)
|
||||
|
|
@ -293,8 +296,8 @@ LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a
|
|||
SO_SUFFIX = so.$(shell echo $(VERSION) | cut -d- -f1)
|
||||
SO_PREFIX ?= lib
|
||||
LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
|
||||
LINKS_SO += $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
|
||||
INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
|
||||
LINKS_SO += $(shell echo $(LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
|
||||
INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
|
||||
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
|
||||
else
|
||||
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
|
||||
|
|
@ -358,7 +361,7 @@ INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
|
|||
# -- HTML
|
||||
BUILD_HTMLDIR = $(TOPDIR)/htdocs
|
||||
LOCAL_HTML += $(wildcard *.html *.css *.php) $(IMAGES)
|
||||
HTML_SUBDIR ?= $(shell pwd | sed 's%.*/htdocs/%%')
|
||||
HTML_SUBDIR ?= $(shell pwd | $(SED) 's%.*/htdocs/%%')
|
||||
ifeq ($(HTML_SUBDIR),)
|
||||
INSTALL_HTMLDIR = $(PROJECT_HTMLDIR)
|
||||
else
|
||||
|
|
@ -535,20 +538,20 @@ define cvs_files
|
|||
endef
|
||||
|
||||
define add_flavour_prefix
|
||||
sed "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g"
|
||||
$(SED) "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g"
|
||||
endef
|
||||
|
||||
define beautify_lib_path
|
||||
sed 's/:/\n + /g'
|
||||
$(SED) 's/:/\n + /g'
|
||||
endef
|
||||
|
||||
#$(shell cat $1/VERSION | sed 's/-dev//; s/-[^-]*$$//')
|
||||
#$(shell cat $1/VERSION | $(SED) 's/-dev//; s/-[^-]*$$//')
|
||||
define cat_version
|
||||
$(shell cat $1/VERSION | sed 's/-dev//')
|
||||
$(shell cat $1/VERSION | $(SED) 's/-dev//')
|
||||
endef
|
||||
|
||||
define version
|
||||
$(shell cat $1/VERSION | sed 's/-.*//')
|
||||
$(shell cat $1/VERSION | $(SED) 's/-.*//')
|
||||
endef
|
||||
|
||||
define install_links
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ $(SSI_PREFIX)%.html: $(TMPHTML) $(SSI_DOWNLOAD_TMPL)
|
|||
EXPLANATION="$(PROJECT_DESCR)";\
|
||||
SIZE=`ls -l $(DIST_FILE) | awk '{print $$5}'`;\
|
||||
FILENAME=`basename $(DIST_FILE)` ;\
|
||||
URLDIR=`echo $(DOWNLOAD_URLDIR) | sed -e 's/\\//\\\\\//g;'` ;\
|
||||
cat $(SSI_DOWNLOAD_TMPL) | sed -e "\
|
||||
URLDIR=`echo $(DOWNLOAD_URLDIR) | $(SED) -e 's/\\//\\\\\//g;'` ;\
|
||||
cat $(SSI_DOWNLOAD_TMPL) | $(SED) -e "\
|
||||
s/_VERSION_/$(LOCAL_DIST_VERSION)/g;\
|
||||
s/_PROJECT_/$(LOCAL_PROJECT)/g;\
|
||||
s/_TARGET_STEM_//g;\
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ html: doxygen.done cpfiles.done
|
|||
|
||||
|
||||
%: %.tmpl
|
||||
sed " \
|
||||
$(SED) " \
|
||||
s/__VERSION__/$(DIST_VERSION)/; \
|
||||
s/__PROJECT__/$(PROJECT)/; \
|
||||
s/__PROJECT_CAPNAME__/$(PROJECT_CAPNAME)/; \
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ CD_FILES = \
|
|||
$(ISOLINUX_BIN)
|
||||
|
||||
define SYSLINUX_BASE
|
||||
$(notdir $(shell sed 's/.tar.bz2$$//' $(URL_FILE)))
|
||||
$(notdir $(shell $(SED) 's/.tar.bz2$$//' $(URL_FILE)))
|
||||
endef
|
||||
|
||||
# == targets
|
||||
|
|
@ -40,7 +40,7 @@ dirs.done:
|
|||
|
||||
$(URL_FILE):
|
||||
lynx -dump $(URL_BASE) | \
|
||||
sed '/syslinux-.*\.tar\.bz2$$/ !d; s/ .*http:/http:/' |\
|
||||
$(SED) '/syslinux-.*\.tar\.bz2$$/ !d; s/ .*http:/http:/' |\
|
||||
tail -1 > $@.tmp
|
||||
mv $@.tmp $@
|
||||
|
||||
|
|
@ -51,7 +51,7 @@ dload.done: $(URL_FILE)
|
|||
$(MENU_32): unpack.done
|
||||
|
||||
unpack.done: $(URL_FILE) dload.done
|
||||
tar -xjf $(shell echo $(DLOAD_DIR)/$(SYSLINUX_BASE).tar.bz2 | sed 's/ //g')
|
||||
tar -xjf $(shell echo $(DLOAD_DIR)/$(SYSLINUX_BASE).tar.bz2 | $(SED) 's/ //g')
|
||||
mv $(SYSLINUX_BASE) $(UNPACK_DIR)
|
||||
touch $@
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
LD_LIB_PATH_ENV := $(LD_LIBRARY_PATH)
|
||||
EXE_SEARCH_PATH_ENV := $(PATH)
|
||||
LD_LIB_PATH_LDFLAGS = $(shell echo $(LDFLAGS) | sed 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')
|
||||
LD_LIB_PATH_LDFLAGS = $(shell echo $(LDFLAGS) | $(SED) 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')
|
||||
|
||||
ifeq ($(TARGET),mingw)
|
||||
DLL_PATH = $(shell echo $(LD_LIBRARY_PATH) | sed 's/:/;/g');$(CROSS_TOOL_DIR)/bin
|
||||
DLL_PATH = $(shell echo $(LD_LIBRARY_PATH) | $(SED) 's/:/;/g');$(CROSS_TOOL_DIR)/bin
|
||||
endif
|
||||
|
||||
export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH_LDFLAGS):$(LD_LIB_PATH):$(LD_LIB_PATH_ENV)) | sed 's/ /:/g; s/::/:/g')
|
||||
export PATH=$(shell echo $(strip $(EXE_SEARCH_PATH):$(EXE_SEARCH_PATH_ENV)) | sed 's/ /:/g; s/::/:/g')
|
||||
export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH_LDFLAGS):$(LD_LIB_PATH):$(LD_LIB_PATH_ENV)) | $(SED) 's/ /:/g; s/::/:/g')
|
||||
export PATH=$(shell echo $(strip $(EXE_SEARCH_PATH):$(EXE_SEARCH_PATH_ENV)) | $(SED) 's/ /:/g; s/::/:/g')
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ 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)
|
||||
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 ?= ftp.jannet.de
|
||||
UPLOAD_PATH ?= /home/ftp/dat/pub/packages/$(CUSTOMER)/$(KERNEL_BASE)
|
||||
UPLOAD_OWNER ?= $(shell whoami)
|
||||
|
|
@ -36,8 +36,8 @@ else
|
|||
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')
|
||||
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)
|
||||
ifeq ($(RPMBUILD),)
|
||||
|
|
@ -47,7 +47,7 @@ endif
|
|||
#ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),)
|
||||
#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)
|
||||
#else
|
||||
|
|
@ -98,7 +98,7 @@ all: rpm
|
|||
touch $@
|
||||
|
||||
$(TMP_INSTALL)/$(F_SPEC): linux-$(KERNEL_VERSION)/Makefile $(MKSPEC) Makefile
|
||||
sh $(MKSPEC) -d $(TMP_INSTALL) -b $(KERNEL_BASE) -v $(shell echo $(COMPLETE_VERSION) | sed 's/-[0-9][0-9]*.*//') -r $(RPM_RELEASE) -a $(ARCH) -l $(BOOT_LABEL) > $@
|
||||
sh $(MKSPEC) -d $(TMP_INSTALL) -b $(KERNEL_BASE) -v $(shell echo $(COMPLETE_VERSION) | $(SED) 's/-[0-9][0-9]*.*//') -r $(RPM_RELEASE) -a $(ARCH) -l $(BOOT_LABEL) > $@
|
||||
|
||||
$(TMP_INSTALL)/boot/%-$(KERNEL_VERSION)-$(RPM_RELEASE): build.lxdone $(LOCAL_AFTER_KERNEL_BUILD)
|
||||
@echo -n
|
||||
|
|
@ -156,7 +156,7 @@ upload.done: $(F_RPMS)
|
|||
touch $@
|
||||
|
||||
%.rpm.uldone: %.rpm
|
||||
upload.sh $< rsync_ssh://$(UPLOAD_HOST):$(UPLOAD_PATH)/rpm/$(shell echo $@ | sed 's/.*\(run\|devel\).*/\1/')/$<:640:750:$(UPLOAD_OWNER).$(CUSTOMER)
|
||||
upload.sh $< rsync_ssh://$(UPLOAD_HOST):$(UPLOAD_PATH)/rpm/$(shell echo $@ | $(SED) 's/.*\(run\|devel\).*/\1/')/$<:640:750:$(UPLOAD_OWNER).$(CUSTOMER)
|
||||
touch $@
|
||||
|
||||
current.uldone: $(F_CURRENT)
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ else
|
|||
KERNEL_SRC_DIR = linux-$(KERNEL_VERSION)
|
||||
endif
|
||||
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')
|
||||
TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g')
|
||||
ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g')
|
||||
|
||||
PATCHES += $(wildcard $(LINUX_KERNEL_PATCH_DIR)/*-$(KERNEL_VERSION).patch) \
|
||||
$(wildcard $(LINUX_KERNEL_PATCH_DIR)/*-$(KERNEL_VERSION).diff)
|
||||
|
|
@ -56,17 +56,17 @@ $(KERNEL_PKG):
|
|||
install -m 664 $(notdir $(KERNEL_PKG)) $@
|
||||
|
||||
EXTRAVERSION: linux-$(KERNEL_VERSION)/Makefile
|
||||
sed '/^ *EXTRAVERSION *=/ !d; s/^ *EXTRAVERSION *= *-*//; s/ *$$//' $< >$@
|
||||
$(SED) '/^ *EXTRAVERSION *=/ !d; s/^ *EXTRAVERSION *= *-*//; s/ *$$//' $< >$@
|
||||
|
||||
COMPLETE_VERSION: EXTRAVERSION
|
||||
#ifeq ($(shell echo $(KERNEL_VERSION) | sed '/[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*/ !d'),)
|
||||
# echo -n $(KERNEL_VERSION)-$(EXTRAVERSION) | sed 's/- *$$//' > $@
|
||||
#ifeq ($(shell echo $(KERNEL_VERSION) | $(SED) '/[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*/ !d'),)
|
||||
# echo -n $(KERNEL_VERSION)-$(EXTRAVERSION) | $(SED) 's/- *$$//' > $@
|
||||
#else
|
||||
echo -n $(KERNEL_MAJOR).$(KERNEL_MINOR).$(KERNEL_RELEASE)$(EXTRAVERSION) > $@
|
||||
#endif
|
||||
|
||||
config-$(KERNEL_VERSION):
|
||||
cp $(shell ls config-$(KERNEL_MAJOR).$(KERNEL_MINOR).* | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]\)[.$$]./\1.\2.0\3/; s/\.\([0-9]\)$$/.0\1/' | sort -g | sed 's/\.0/./g; $$ !d') $@
|
||||
cp $(shell ls config-$(KERNEL_MAJOR).$(KERNEL_MINOR).* | $(SED) 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]\)[.$$]./\1.\2.0\3/; s/\.\([0-9]\)$$/.0\1/' | sort -g | $(SED) 's/\.0/./g; $$ !d') $@
|
||||
cvs add $@
|
||||
cvs commit $@
|
||||
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ FTP_HOST_LOGIN ?= root
|
|||
RPM_PROJECT ?= $(PROJECT)
|
||||
RPM_VERSION ?= $(DIST_VERSION)
|
||||
LAST_RPM_VERSION_FILE = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX)
|
||||
LAST_RPM_VERSION ?= $(shell sed 's/-dev$$//' $(LAST_RPM_VERSION_FILE) 2>/dev/null)
|
||||
LAST_RPM_VERSION ?= $(shell $(SED) 's/-dev$$//' $(LAST_RPM_VERSION_FILE) 2>/dev/null)
|
||||
RPM_ARCH ?= i586
|
||||
RPMBUILD ?= rpmbuild
|
||||
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
|
||||
HASH = $(shell $(cvs_files) | \
|
||||
grep -v "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \
|
||||
xargs md5sum | md5sum | sed 's/ .*//')
|
||||
xargs md5sum | md5sum | $(SED) 's/ .*//')
|
||||
LOCAL_REPO ?= /srv/ftp/pub/local/packages/suse/11.4
|
||||
|
||||
include $(MODDIR)/make/tag-defs.mk
|
||||
|
|
@ -42,9 +42,9 @@ PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
|
|||
|
||||
include $(MODDIR)/make/upload-defs-rpm.mk
|
||||
|
||||
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | sed 's/\b.*\///g; s/:.*\b//g')
|
||||
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%^[./]*%%"))
|
||||
$(SED) "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%"))
|
||||
RPMS_DIR = /usr/src/packages/RPMS/$(RPM_ARCH)
|
||||
SRPMS_DIR = /usr/src/packages/SRPMS
|
||||
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
|
||||
|
|
@ -139,7 +139,7 @@ rpmbuild.dist: $(DIST_PCKG_RPM) $(DIST_FILES)
|
|||
|
||||
rpminstall.dist: $(DIST_PCKG_RPM)
|
||||
@set -e; for p in $^; do \
|
||||
if ! /bin/rpm -q `basename $$p | sed "s/\.$(RPM_ARCH)\.rpm//"` > /dev/null 2>&1 ; then \
|
||||
if ! /bin/rpm -q `basename $$p | $(SED) "s/\.$(RPM_ARCH)\.rpm//"` > /dev/null 2>&1 ; then \
|
||||
echo + installing $$p ;\
|
||||
sudo /bin/rpm -U $$p; \
|
||||
fi; \
|
||||
|
|
@ -234,7 +234,7 @@ rpm-check-release:
|
|||
rpm-release: rpm-update-release
|
||||
@if [ "$(LAST_RPM_VERSION)" != "$(RPM_VERSION)" ]; then \
|
||||
$(check_cvs_sync) ;\
|
||||
echo "+ version $(RPM_VERSION) doesn't match latest released rpm version "\
|
||||
echo "+ version $(RPM_VERSION) doesn't match latest relea$(SED) rpm version "\
|
||||
"$(LAST_RPM_VERSION), building a new release" ;\
|
||||
make rpm-clean update-repo.dist || exit 1;\
|
||||
cp VERSION $(LAST_RPM_VERSION_FILE) ;\
|
||||
|
|
@ -243,6 +243,6 @@ rpm-release: rpm-update-release
|
|||
fi ;\
|
||||
cvs commit -m "o `cat $(LAST_RPM_VERSION_FILE)`" $(LAST_RPM_VERSION_FILE) ;\
|
||||
else \
|
||||
echo "+ version matches latest released rpm version" ;\
|
||||
echo "+ version matches latest relea$(SED) rpm version" ;\
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ echo-contrib:
|
|||
|
||||
trace-marks:
|
||||
for f in $(ALL_CPP); do \
|
||||
sed 's/^{$$/{_/' $$f > $$f.rep ;\
|
||||
$(SED) 's/^{$$/{_/' $$f > $$f.rep ;\
|
||||
cp $$f.rep $$f ;\
|
||||
done
|
||||
|
||||
|
|
@ -211,7 +211,7 @@ $(LIB_SO): $(VERSION_SCRIPT) $(LIB_A) $(TOPDIR)/dir_build_LIB.done
|
|||
$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
|
||||
else
|
||||
$(WINRES_RC): $(WINRES_RC_TMPL)
|
||||
cat $< | sed " \
|
||||
cat $< | $(SED) " \
|
||||
s/__VER_FILEVERSION__/$(MAJOR_VERSION),$(MINOR_VERSION),$(RELEASE_VERSION),$(BUILD_NUMBER)/; \
|
||||
s/__VER_FILEVERSION_STR__/$(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION).$(BUILD_NUMBER)/; \
|
||||
s/__VER_DESCRIPTION__/\"$(PROJECT_DESCR)\"/; \
|
||||
|
|
@ -224,7 +224,7 @@ $(WINRES_O): $(WINRES_RC)
|
|||
|
||||
$(LIB_SO): $(VERSION_SCRIPT) $(WINRES_O) $(LIB_A) $(TOPDIR)/dir_build_LIB.done
|
||||
$(LD) -shared -Wl,--whole-archive,--out-implib,$(shell echo $(LIB_A) | \
|
||||
sed 's/-static//'),--output-def,$(LIB_DEF) $(VERSION_SCRIPT) $(LIB_A) $(WINRES_O) \
|
||||
$(SED) 's/-static//'),--output-def,$(LIB_DEF) $(VERSION_SCRIPT) $(LIB_A) $(WINRES_O) \
|
||||
-Wl,--no-whole-archive $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
|
||||
$(MSVCPP_IMPLIB): $(LIB_SO)
|
||||
$(MS_LD) /machine:i386 /def:$(LIB_DEF)
|
||||
|
|
@ -323,7 +323,7 @@ $$(TOPDIR)/dir_build_$(1).done:
|
|||
touch $$@
|
||||
|
||||
$$(BUILD_$(1)DIR)/%: % $$(TOPDIR)/dir_build_$(1).done
|
||||
@if [ ! $$< -ef $$@ -a "`echo $$< | sed 's/\..*//'`" != local ]; then \
|
||||
@if [ ! $$< -ef $$@ -a "`echo $$< | $(SED) 's/\..*//'`" != local ]; then \
|
||||
echo install -m $($(1)MODE) $$< $$@ ;\
|
||||
install -m $($(1)MODE) $$< $$@ ;\
|
||||
rm -f $$(TOPDIR)/dirs-*.done ;\
|
||||
|
|
@ -347,7 +347,7 @@ endef
|
|||
$(foreach type, $(INSTALLATION_FILE_TYPES), $(eval $(call std_install_rules,$(type))))
|
||||
|
||||
$(sort $(LINKS_SO)):
|
||||
cd $(dir $@); ln -sf $(shell echo $@ | sed -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX) $(notdir $@)
|
||||
cd $(dir $@); ln -sf $(shell echo $@ | $(SED) -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX) $(notdir $@)
|
||||
|
||||
ifeq ($(DEVELOPMENT),true)
|
||||
install_profile_path:
|
||||
|
|
@ -356,8 +356,8 @@ install_profile_path: $(INSTALLED_PROFILE_PATH_SCRIPT)
|
|||
endif
|
||||
|
||||
$(INSTALLED_PROFILE_PATH_SCRIPT): $(TOPDIR)/profiledir.done
|
||||
echo "if [ -z \"\$$PATH\" ]; then PATH=$(shell echo $(INSTALL_EXEDIR) | sed -e s%^$(ENV_PREFIX)/%/%)" > path_script.sh
|
||||
echo "else PATH=\$$PATH:$(shell echo $(INSTALL_EXEDIR) | sed -e s%^$(ENV_PREFIX)/%/%); fi" >> path_script.sh
|
||||
echo "if [ -z \"\$$PATH\" ]; then PATH=$(shell echo $(INSTALL_EXEDIR) | $(SED) -e s%^$(ENV_PREFIX)/%/%)" > path_script.sh
|
||||
echo "else PATH=\$$PATH:$(shell echo $(INSTALL_EXEDIR) | $(SED) -e s%^$(ENV_PREFIX)/%/%); fi" >> path_script.sh
|
||||
$(INSTALL) -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@
|
||||
|
||||
core-pattern:
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@ include $(MODDIR)/make/defs.mk
|
|||
# === rules
|
||||
selection.done: $(MODDIR)/make/smart-selection.mk
|
||||
rpm -qa --queryformat '%{NAME}\n' | sort -u | \
|
||||
sed '/gpg-pubkey/ d' > $(SELECTION).tmp
|
||||
$(SED) '/gpg-pubkey/ d' > $(SELECTION).tmp
|
||||
mv $(SELECTION).tmp $(SELECTION)
|
||||
touch $@
|
||||
|
||||
channels.done: $(MODDIR)/make/smart-selection.mk
|
||||
smart channel --show | sed '/\[rpm-sys\]/,+3 d' > $(CHANNEL_LIST)
|
||||
smart channel --show | $(SED) '/\[rpm-sys\]/,+3 d' > $(CHANNEL_LIST)
|
||||
touch $@
|
||||
|
||||
upload.done: selection.done
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
TAG_VERSION = V_$(shell echo $(VERSION) | sed 's/[\.-]/_/g')
|
||||
TAG_VERSION = V_$(shell echo $(VERSION) | $(SED) 's/[\.-]/_/g')
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ GENERATED_TEX = $(filter %.tex,$(GENERATED))
|
|||
GENERATED_EPS = $(filter %.png,$(GENERATED))
|
||||
GENERATED_HTML = $(filter %.html,$(GENERATED))
|
||||
|
||||
CMD_PARSE_GRAPHICS = sed '/includegraphics/ !d; s/[^{]*{\([^}]*\).*/\1/; /^\.\./ d; s/^.\///' *.tex *.tmpl | sort -u
|
||||
CMD_PARSE_GRAPHICS = $(SED) '/includegraphics/ !d; s/[^{]*{\([^}]*\).*/\1/; /^\.\./ d; s/^.\///' *.tex *.tmpl | sort -u
|
||||
|
||||
CONTACT_EMAIL ?= contact@jannet.de
|
||||
ifeq ($(DIST_VERSION),)
|
||||
|
|
@ -95,7 +95,7 @@ define mangle_tmpl
|
|||
@echo "+ generating $< -> $@"
|
||||
@if [ $(suffix $@) = tex ]; then echo -e $(TEX_WARN_DONT_EDIT) > $@; fi
|
||||
@if [ $(suffix $@) = html ]; then echo -e $(HTML_WARN_DONT_EDIT) > $@; fi
|
||||
cat $< | sed -e "\
|
||||
cat $< | $(SED) -e "\
|
||||
s%__DATE__%$(DATE)%g; \
|
||||
s%__AUTHORS__%$(AUTHORS)%g; \
|
||||
s%__CONTACT_EMAIL__%$(CONTACT_EMAIL)%g; \
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ do-install-links:
|
|||
@@cwd=`pwd`; \
|
||||
echo "o in $(INSTALL_LIBDIR):" ;\
|
||||
find lib -name '*.so' -o -name '*.so.*' -o -name '*.a' -o -name '*.dll' | \
|
||||
sed 's%^\./%%' | \
|
||||
$(SED) 's%^\./%%' | \
|
||||
while read f; do \
|
||||
cd $(INSTALL_LIBDIR) && { \
|
||||
echo " sudo ln -sf $$cwd/$$f" ; \
|
||||
|
|
@ -57,7 +57,7 @@ do-install-links:
|
|||
done; \
|
||||
echo "o in $(INSTALL_EXEDIR):" ;\
|
||||
find bin -type f -a -perm -u+x | \
|
||||
sed 's%^\./%%' | \
|
||||
$(SED) 's%^\./%%' | \
|
||||
while read f; do \
|
||||
cd $(INSTALL_EXEDIR) && { \
|
||||
echo " sudo ln -sf $$cwd/$$f" ; \
|
||||
|
|
@ -66,7 +66,7 @@ do-install-links:
|
|||
done ;\
|
||||
echo "o in $(INSTALL_HDRDIR):" ;\
|
||||
find include -name '*.h' | \
|
||||
sed 's%^\./%%' | \
|
||||
$(SED) 's%^\./%%' | \
|
||||
while read f; do \
|
||||
cd $(INSTALL_HDRDIR) && { \
|
||||
echo " sudo ln -sf $$cwd/$$f" ; \
|
||||
|
|
@ -75,7 +75,7 @@ do-install-links:
|
|||
done; \
|
||||
echo "o in $(INSTALL_MAKEDIR):" ;\
|
||||
find make -name '*.mk' | \
|
||||
sed 's%^\./%%' | \
|
||||
$(SED) 's%^\./%%' | \
|
||||
while read f; do \
|
||||
cd $(INSTALL_MAKEDIR) && { \
|
||||
echo " sudo ln -sf $$cwd/$$f" ; \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
rsync_ssh\://% ftp\://% scp\://%:
|
||||
make $(shell echo $(addprefix $(DIST_PCKG_DIR)/,$(notdir $@)) | sed 's/:.*//g')
|
||||
$(UPLOAD_SH) $(shell echo $(addprefix $(DIST_PCKG_DIR)/,$(notdir $@)) $@ | sed 's/:.*//g') $@
|
||||
make $(shell echo $(addprefix $(DIST_PCKG_DIR)/,$(notdir $@)) | $(SED) 's/:.*//g')
|
||||
$(UPLOAD_SH) $(shell echo $(addprefix $(DIST_PCKG_DIR)/,$(notdir $@)) $@ | $(SED) 's/:.*//g') $@
|
||||
|
||||
upload.dist:
|
||||
if [ -f configure -o -f configure.ac -o -f configure.ac.tmpl ]; then make config; fi
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ all:
|
|||
upload: upload.dist
|
||||
|
||||
rsync_ssh\://% ftp\://% scp\://%:
|
||||
make $(shell echo $(notdir $@) | sed 's/:.*//g')
|
||||
$(UPLOAD_SH) $(shell echo $(notdir $@) $@ | sed 's/:.*//g') $@
|
||||
make $(shell echo $(notdir $@) | $(SED) 's/:.*//g')
|
||||
$(UPLOAD_SH) $(shell echo $(notdir $@) $@ | $(SED) 's/:.*//g') $@
|
||||
|
||||
upload.dist: $(UPLOAD_FILES)
|
||||
ifneq ($(UPLOAD_LAST_VERSION),$(VERSION))
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ $(WINLIB): $(REQUIRED_H)
|
|||
echo "++++ $$modfiles"; \
|
||||
if [ -n "$$modfiles" ]; then cp $$modfiles $(DISTDIR)/src/$(PROJECT)/mod/$$mod/; fi ;\
|
||||
if [ -f "$$dir/Makefile" ]; then \
|
||||
sed $$dir/Makefile -e "s/^TOPDIR\ *=.*/TOPDIR = \.\.\/\.\./g" > $(DISTDIR)/src/$(PROJECT)/mod/$$mod/Makefile ;\
|
||||
$(SED) $$dir/Makefile -e "s/^TOPDIR\ *=.*/TOPDIR = \.\.\/\.\./g" > $(DISTDIR)/src/$(PROJECT)/mod/$$mod/Makefile ;\
|
||||
fi; \
|
||||
done ;\
|
||||
cp $(MODDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue