mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
a87bea7d39
- When cups is installed (including when doing a Core Update that includes a cups update) the 5 min delay for starting cups means that it has not restarted by the time that the reboot for the CU has been started. There are then error messages that say that cups couldn't be stopped as it was not running. - When a normal reboot is carried out withoutr any update of cups then the startup has no delay and it starts without any trouble. - This patch removes the 300 secs delay from the start_service line in the install.sh paks file. - The PAK_VER is bumped to ensure that this change is shipped Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
112 lines
3.9 KiB
Plaintext
112 lines
3.9 KiB
Plaintext
###############################################################################
|
|
# #
|
|
# IPFire.org - A linux based firewall #
|
|
# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
|
|
# #
|
|
# This program is free software: you can redistribute it and/or modify #
|
|
# it under the terms of the GNU General Public License as published by #
|
|
# the Free Software Foundation, either version 3 of the License, or #
|
|
# (at your option) any later version. #
|
|
# #
|
|
# This program is distributed in the hope that it will be useful, #
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
|
# GNU General Public License for more details. #
|
|
# #
|
|
# You should have received a copy of the GNU General Public License #
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
|
|
# #
|
|
###############################################################################
|
|
|
|
###############################################################################
|
|
# Definitions
|
|
###############################################################################
|
|
|
|
include Config
|
|
|
|
VER = 2.4.6
|
|
SUMMARY = The Common UNIX Printing System
|
|
|
|
THISAPP = cups-$(VER)
|
|
DL_FILE = $(THISAPP)-source.tar.gz
|
|
DL_FROM = $(URL_IPFIRE)
|
|
DIR_APP = $(DIR_SRC)/cups-$(VER)
|
|
TARGET = $(DIR_INFO)/$(THISAPP)
|
|
PROG = cups
|
|
PAK_VER = 37
|
|
|
|
DEPS = avahi cups-filters dbus ghostscript libexif
|
|
|
|
SERVICES = cups
|
|
|
|
###############################################################################
|
|
# Top-level Rules
|
|
###############################################################################
|
|
|
|
objects = $(DL_FILE)
|
|
|
|
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
|
|
|
$(DL_FILE)_BLAKE2 = 4e61112ddaa46f20b1cfcb8f523dd07ba7d82604b9857754b288a2a9c5bc50ce242cfa119867347e4696818dc2eb505cf7fff1f9a0634e314edb2500395b83e4
|
|
|
|
install : $(TARGET)
|
|
|
|
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
|
|
|
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
|
|
|
b2 : $(subst %,%_BLAKE2,$(objects))
|
|
|
|
dist:
|
|
$(PAK)
|
|
|
|
###############################################################################
|
|
# Downloading, checking, b2sum
|
|
###############################################################################
|
|
|
|
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
|
|
@$(CHECK)
|
|
|
|
$(patsubst %,$(DIR_DL)/%,$(objects)) :
|
|
@$(LOAD)
|
|
|
|
$(subst %,%_BLAKE2,$(objects)) :
|
|
@$(B2SUM)
|
|
|
|
###############################################################################
|
|
# Installation Details
|
|
###############################################################################
|
|
|
|
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
|
@$(PREBUILD)
|
|
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
|
|
$(UPDATE_AUTOMAKE)
|
|
cd $(DIR_APP) && \
|
|
./configure \
|
|
--prefix=/usr \
|
|
--sysconfdir=/var/ipfire \
|
|
--localstatedir=/var \
|
|
--enable-debug \
|
|
--with-dnssd=avahi \
|
|
--enable-dbus \
|
|
--with-tls=openssl \
|
|
--enable-libusb
|
|
|
|
cd $(DIR_APP) && make $(MAKETUNING)
|
|
cd $(DIR_APP) && make install
|
|
|
|
cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
|
|
|
|
install -v -m 644 $(DIR_SRC)/config/backup/includes/cups \
|
|
/var/ipfire/backup/addons/includes/cups
|
|
|
|
# install initscript
|
|
$(call INSTALL_INITSCRIPTS,$(SERVICES))
|
|
cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
|
|
|
|
# Install convenience link
|
|
ln -svf /var/ipfire/cups /etc/cups
|
|
|
|
@rm -rf $(DIR_APP)
|
|
@$(POSTBUILD)
|