From nobody Fri May 17 12:12:04 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vgm6X2GZZz5L4bS; Fri, 17 May 2024 12:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgm6X1lddz41tj; Fri, 17 May 2024 12:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715947924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eAFnTXT4uZsckbzUPXRdPKmfrjiYvxT6kxOQBzervHI=; b=K6TxGJEq6h7XA/H3uQbLCyWJvJlP0ffW6uDULFKplVwJupddpaf01v/V/a5FbO6gohn7Ub pvnjDgeBYzwRMCRZuj/8h/UaR8SWeJCZyo7BdaH3ZS5Nfc0uRMnTkoNArCsyXLkMsIRw15 pmwbnzbzju/6Qv6riDXFRvL4da0/67ww6OaMFqyv3wnFxZejDE/sdF1Yt/hfCv4OdFoK6u cKfG8H0LC3H8UYPjkkn+h5ACC3Vtm495nOFe+SG2ovizPFmIDuCt3hbTHrdpbMR3I1bkak sk0zNXP7lfUryv2cTGwyxDZXadIhAx2dNsdU8Q2aZuDxyeaMmmQke+h7ckZknA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715947924; a=rsa-sha256; cv=none; b=lUXn0T9i8oa7M156y+UL94hCvW4OqvuK8HSNCDHOjlWdIj+RbAf8QCwD2CBZmQxbaJt+mx RUJZFSMfsPck0R+qF/A9IswLBK60/49K9fu05SGX2s9VhiSGCinOtRJBPuKxkztHs1YN3o savs/WZeSF9C4k1XECdakt5+ut6fLWW2ZYuROYB/ulHZRIBhztV+fjdLhwj3AKAlGuETRo jepLr2tWt3Q+Ukj9PhUGGMlgR0vhD+1xJLLZBF+ek1uOIMXT+5ycxloqrQrZ94lu3hgYDp onC7lJ39rRwffIgFtFJFOMMRKaf1sKBYcAso0DKY3XHZMzDRXboaiufXGjqW7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715947924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eAFnTXT4uZsckbzUPXRdPKmfrjiYvxT6kxOQBzervHI=; b=fNapxwR5urIGmXgCvRv9N73DkNjTrJxDUviHIulNX0Fb9i/M1iCzMQ9sDc5Cn4ZvfGh6QM MKGKgvlQ6ckjHRhKClsB8MAeZ412YEAMum/q0BXEaKw2lrwGLmIRyaJjJp7abG61QCHB0r 4go1IRJNSfdKvQghRu666BjmQTgerPNUHHsnU7EbGYSyg4bxwmHZjzwJ4xFgBy699Njgha YugJTJvkgXn9XH6tZ41yPdc4RbteRpCuU+5fho464yKRHXgvESHQuqViXPT9tM9fDZOBvd dhymNyPrfzY5iIN8B5k2c66dFjTJH8dzXMu6ODpgW5mulQQpsTJU1At5ZwzLJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vgm6X1Lq5zj3M; Fri, 17 May 2024 12:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HCC4UB060975; Fri, 17 May 2024 12:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HCC4Br060972; Fri, 17 May 2024 12:12:04 GMT (envelope-from git) Date: Fri, 17 May 2024 12:12:04 GMT Message-Id: <202405171212.44HCC4Br060972@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: dd822b4dce4a - main - net/wifibox-alpine: Move away from the use of Alpine Linux mirrors List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd822b4dce4a8325b2b000da4682f313d73b26f6 Auto-Submitted: auto-generated The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd822b4dce4a8325b2b000da4682f313d73b26f6 commit dd822b4dce4a8325b2b000da4682f313d73b26f6 Author: PÁLI Gábor János AuthorDate: 2024-05-17 08:32:54 +0000 Commit: Ashish SHUKLA CommitDate: 2024-05-17 12:11:37 +0000 net/wifibox-alpine: Move away from the use of Alpine Linux mirrors Alpine Linux packages are maintained in a rolling fashion and periodic snapshots seem to be gone recently. Store the specific APK versions of dependencies on the project's GitHub to unbreak the build when optional packages (e.g. mDNSResponder) are configured to use and which are not cached by the FreeBSD distfile mirrors. While here, start mirroring the root file system tarball in use, just to become completely independent from the Alpine Linux CDN. --- net/wifibox-alpine/Makefile | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/net/wifibox-alpine/Makefile b/net/wifibox-alpine/Makefile index 41cdfe960d26..4a6bf957fd6e 100644 --- a/net/wifibox-alpine/Makefile +++ b/net/wifibox-alpine/Makefile @@ -95,31 +95,15 @@ GH_ACCOUNT= pgj GH_PROJECT= freebsd-wifibox-alpine:scripts GH_TAGNAME= 3ce5b1faf48ef4b9d52c38bf518aa612242fba3f:scripts -ALPINE_VERSION= 3.19.1 -ALPINE_DATE= 2024.03.23 - +ALPINE_VERSION= 3.19.1 LINUX_LTS_VERSION= 6.6.22-r1 LINUX_EDGE_VERSION= 6.8.1-r1 -_ALPINE_VER= ${ALPINE_VERSION:C@([0-9]+)\.([0-9]+).*@\1.\2@} -_ALPINE_SITE1= https://dl-cdn.alpinelinux.org/alpine/v${_ALPINE_VER} - -_ALPINE_BASE= https://mirror.fel.cvut.cz - -.if defined(ALPINE_DATE) -_SNAPSHOT= ${ALPINE_DATE:S/./-/g} -_ALPINE_SITE2= ${_ALPINE_BASE}/alpine/snapshots/${_SNAPSHOT}/v${_ALPINE_VER} -.else -_ALPINE_SITE2= ${_ALPINE_BASE}/alpine/v${_ALPINE_VER} -.endif - _LINUXFW_SITE= https://git.kernel.org/pub/scm/linux/kernel/git/firmware/ _LINUXFW_TAG= 20240312 _LINUXFW= linux-firmware-${_LINUXFW_TAG} -MASTER_SITES+= ${_ALPINE_SITE1}/releases/x86_64/:rootfs \ - ${_ALPINE_SITE2}/main/x86_64/:main_packages \ - ${_ALPINE_SITE2}/community/x86_64/:community_packages \ +MASTER_SITES+= ${_GITHUB_SITE}/upstream/:upstream \ ${_GITHUB_SITE}/packages/:custom_packages \ ${_LINUXFW_SITE}/linux-firmware.git/snapshot/:linux_firmware \ https://sources.openwrt.org/:openwrt \ @@ -287,7 +271,7 @@ PORT_OPTIONS+= FW_${flavor:tu} .endfor DIST_SUBDIR= wifibox-alpine -DISTFILES+= ${_MINIROOTFS}:rootfs +DISTFILES+= ${_MINIROOTFS}:upstream LFW_ATH10K_FILES= ath10k LFW_ATH11K_FILES= ath11k @@ -381,10 +365,8 @@ DISTFILES+= ${_LINUXFWFILE}:linux_firmware .for package in ${_PACKAGES} .if ${package:M*\:wifibox} DISTFILES+= ${package:C@^([^:]*):wifibox$@\1@}.apk:custom_packages -.elif ${package:M*\:community} -DISTFILES+= ${package:C@^([^:]*):community$@\1@}.apk:community_packages .else -DISTFILES+= ${package:C@^([^:]*):wifibox$@\1@}.apk:main_packages +DISTFILES+= ${package:C@^([^:]*):wifibox$@\1@}.apk:upstream .endif _APK_FILES+= ${_DISTDIR}/${package:C@^([^:]*):.*$@\1@}.apk .endfor @@ -492,15 +474,4 @@ MAKE_ARGS+= VERSION=${PORTVERSION} \ MAKE_ARGS+= FIRMWARE_FILES=${FIRMWARE_FILES} .endif -.if make(check-alpine-packages) -_APK_FETCH!= ${MAKE} fetch-urlall-list | ${GREP} apk | ${GREP} -v distcache -.endif - -check-alpine-packages: -.for apk in ${_APK_FETCH} - @${ECHO} -n "${apk:C@^.*/([0-9A-za-z\._-]*)@\1@} (${apk})..." - @${FETCH_CMD} -s ${apk} > /dev/null - @${ECHO} "OK" -.endfor - .include