From patchwork Thu Nov 30 02:55:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Wicki X-Patchwork-Id: 35408 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41151C46CA7 for ; Thu, 30 Nov 2023 02:56:10 +0000 (UTC) Received: from ci74p00im-qukt09090301.me.com (ci74p00im-qukt09090301.me.com [17.57.156.20]) by mx.groups.io with SMTP id smtpd.web10.63781.1701312964348981192 for ; Wed, 29 Nov 2023 18:56:04 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@subset.ch header.s=sig1 header.b=mFGvzgi2; spf=pass (domain: subset.ch, ip: 17.57.156.20, mailfrom: patrick.wicki@subset.ch) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=subset.ch; s=sig1; t=1701312963; bh=FMco+fKHHna6g68BBLG1OJ77WUO/6hTxjhxtY57hWes=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=mFGvzgi2qBTYVH5stA8IdULnLqeTMG7d3uwjy72GYE2EIN/DKoW9oOtoK2Exk+hHU oSj2qk00jxXt6rZg+LY0WbIgWYrUmhQwPJAtIQ3YM5M3uKeuA0n16rUXnHjwUIWUkE AfwD87dieBWCN+Q+oCYglFauNTJbyoUdsfejv73fb5hCp8CviAG5DVVVwhvOH3MEvY B7cu+XvCmwh2seHd1NZBYDZQ1uzw1sBRA82L/vKqqbH8fMikil6TnC3t5OFj69MK0r RF+/944Ycfdo26SDDZduTrkJ4FuideqdG2fFKD0iR2pKGpzM1ANK4sfViFnZH7qTQi cojLpmQJOeDTQ== Received: from localhost.localdomain (ci77p00im-dlb-asmtp-mailmevip.me.com [17.57.156.26]) by ci74p00im-qukt09090301.me.com (Postfix) with ESMTPSA id B65E5112026E; Thu, 30 Nov 2023 02:56:02 +0000 (UTC) From: patrick.wicki@subset.ch To: openembedded-devel@lists.openembedded.org Cc: Patrick Wicki Subject: [oe][meta-networking][PATCH 4/6] squid: move configs to sub package Date: Thu, 30 Nov 2023 03:55:27 +0100 Message-ID: <14e2e3caff4acb99c107e11ae5f4cd9638b01ab5.1701312810.git.patrick.wicki@siemens.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: 2VK3EqIgbGH4hPCgC7xXP-W6qGmaaWod X-Proofpoint-ORIG-GUID: 2VK3EqIgbGH4hPCgC7xXP-W6qGmaaWod X-Proofpoint-Virus-Version: =?utf-8?q?vendor=3Dfsecure_engine=3D1=2E1=2E170-?= =?utf-8?q?22c6f66c430a71ce266a39bfe25bc2903e8d5c8f=3A6=2E0=2E138=2C18=2E0?= =?utf-8?q?=2E572=2C17=2E0=2E605=2E474=2E0000000_definitions=3D2020-02-14=5F?= =?utf-8?q?11=3A2020-02-14=5F02=2C2020-02-14=5F11=2C2020-01-23=5F02_signatur?= =?utf-8?q?es=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 adultscore=0 mlxscore=0 mlxlogscore=625 spamscore=0 malwarescore=0 clxscore=1030 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000 definitions=main-2311300020 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 30 Nov 2023 02:56:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107157 From: Patrick Wicki Move the config files to a separate squid-conf package. This allows shipping new configs via a custom conf package. Signed-off-by: Patrick Wicki --- meta-networking/recipes-daemons/squid/squid_6.5.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-daemons/squid/squid_6.5.bb b/meta-networking/recipes-daemons/squid/squid_6.5.bb index 66b42ebbb..af3cbe067 100644 --- a/meta-networking/recipes-daemons/squid/squid_6.5.bb +++ b/meta-networking/recipes-daemons/squid/squid_6.5.bb @@ -53,7 +53,10 @@ PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2" PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl" -PACKAGES =+ "${PN}-networkmanager" +PACKAGES =+ " \ + ${PN}-conf \ + ${PN}-networkmanager \ +" BASIC_AUTH = "DB SASL LDAP" @@ -124,7 +127,8 @@ do_install:append() { FILES:${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" FILES:${PN}-dbg += "/usr/src/debug" FILES:${PN}-doc += "${datadir}/*.txt" +FILES:${PN}-conf += "${sysconfdir}/squid" FILES:${PN}-networkmanager = "${libdir}/NetworkManager/dispatcher.d" -RDEPENDS:${PN} += "perl" +RDEPENDS:${PN} += "perl ${PN}-conf" RDEPENDS:${PN}-ptest += "perl make"