File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -215,7 +215,6 @@ omd.spec: omd.spec.in
215215 -e " s/%{pkg_version}/$( PKG_VERSION) /g" \
216216 -e ' s/%{edition}/$(EDITION)/g' \
217217 -e ' s/^Version:.*/Version: $(DISTRO_CODE)/' \
218- -e ' s/^Release:.*/Release: $(OMD_SERIAL)/' \
219218 -e ' s#@APACHE_CONFDIR@#$(APACHE_CONF_DIR)#g' \
220219 -e ' s#@APACHE_NAME@#$(APACHE_INIT_NAME)#g' \
221220 omd.spec.in > omd.spec
Original file line number Diff line number Diff line change @@ -47,8 +47,10 @@ case "$1" in
4747 if [ ! -d /etc/bash_completion.d ]; then
4848 mkdir /etc/bash_completion.d
4949 fi
50+ # Priority is hardcoded to 38, as this used to be OMD_SERIAL which was removed
51+ # see also 34983bf3d7130434f7355cbbac020ffd94c2d90c
5052 update-alternatives --install /omd/versions/default \
51- omd /omd/versions/# ##OMD_VERSION### ###OMD_SERIAL### \
53+ omd /omd/versions/# ##OMD_VERSION### 38 \
5254 --slave /usr/bin/omd omd.bin /omd/versions/# ##OMD_VERSION###/bin/omd \
5355 --slave /etc/bash_completion.d/omd omd.bash_completion /omd/versions/# ##OMD_VERSION###/lib/omd/bash_completion \
5456 --slave /usr/share/man/man8/omd.8.gz omd.man8 \
Original file line number Diff line number Diff line change @@ -68,7 +68,6 @@ install:
6868 done
6969
7070 sed -e 's/# ##OMD_VERSION###/$(OMD_VERSION)/g' \
71- -e 's/###OMD_SERIAL###/$(OMD_SERIAL)/g' \
7271 $(_PWD)/debian/postinst.in > $(_PWD)/debian/postinst
7372 sed -e 's/# ##OMD_VERSION###/$(OMD_VERSION)/g' \
7473 $(_PWD)/debian/preinst.in > $(_PWD)/debian/preinst
Original file line number Diff line number Diff line change @@ -44,7 +44,6 @@ XDG_CACHE_HOME ?= $(HOME)/.cache
4444PACKAGE_CACHE_BASE := $(XDG_CACHE_HOME ) /checkmk/packages
4545
4646CMK_VERSION := $(VERSION )
47- OMD_SERIAL := 38
4847
4948OMD_BASE := /omd
5049OMD_PHYSICAL_BASE := /opt/omd
You can’t perform that action at this time.
0 commit comments