From nobody Mon Feb 9 16:02:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658240300; cv=none; d=zohomail.com; s=zohoarc; b=hSIKIm3kq1iWcYbXcmEM3k1fgc0qQ2gm7kNU9OVsVVX9pfE/9rBOnKXGc1JfNJQnFJMhsJROjOfWD+Hz333hSoaptSYOtAku/rwWISaYZhVCHaU+x8jdwWn0pRynieR/UM2n/nsSa4eiTUCPnY5+k1gC3HF6E+Utuy46utAgWbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658240300; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Vyj2It03JOMWkIP/XaaNnrvi6rCI6zLM7ypUw6Ev500=; b=YbqHQXZs+dfnolI/FQlESf/uf+ImLOAVmaZWrWX3PUU5GP83ipGEgjksaX24MekhLqAiFDxLt1+4n67iWX9BauLmOBIryg2+gV/2C5xNE8qvKCeAsyeJcVKrgEMMl6LzH7X6DRsNndKP5Q8AMpiJ0aXEDKP7E6vWAUrBfeT4/Jg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658240300935380.0563383953356; Tue, 19 Jul 2022 07:18:20 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-307-vXfidchuN5aCVo6igoXNAA-1; Tue, 19 Jul 2022 10:18:15 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C4BD119705D5; Tue, 19 Jul 2022 14:17:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC76B492C3B; Tue, 19 Jul 2022 14:17:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 76B481947070; Tue, 19 Jul 2022 14:17:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4CED7194707F for ; Tue, 19 Jul 2022 14:17:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 31E7E403165; Tue, 19 Jul 2022 14:17:50 +0000 (UTC) Received: from harajuku.redhat.com (unknown [10.40.195.71]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B627F403164 for ; Tue, 19 Jul 2022 14:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658240299; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Vyj2It03JOMWkIP/XaaNnrvi6rCI6zLM7ypUw6Ev500=; b=dHuPpHIkElCXBOEpM3QoNMGBg3iQw6BvwGkW6d1KnEZy0ZIPj7JfiuQVLt9yAurknEKC5k xmQL4E90GfpaKKOKc9yck7LuQrPwUf1OLGYn5F0tPN7UQA7v7oX45ptHzegOWxxndc4P48 ZP/LvYiLHOR5qHB/nwDddQDHnsMFUnM= X-MC-Unique: vXfidchuN5aCVo6igoXNAA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] ci: Fix paths shown in the website Date: Tue, 19 Jul 2022 16:17:45 +0200 Message-Id: <20220719141745.220912-4-abologna@redhat.com> In-Reply-To: <20220719141745.220912-1-abologna@redhat.com> References: <20220719141745.220912-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658240302328100007 Content-Type: text/plain; charset="utf-8" Right now we're setting the prefix to a custom path, which results in paths like /builds/libvirt/libvirt/vroot/etc/libvirt/virtqemud.conf ending up in the generated HTML. In order to avoid that, set the prefix and other installation paths to reasonable default values by passing -Dsystem=3Dtrue and then take advantage of $DESTDIR support to still be able to write the HTML files without requiring root privileges. Reported-by: Martin Kletzander Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a8b89729f..d5c431dee0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,9 +67,9 @@ website: before_script: - *script_variables script: - - meson setup build --werror --prefix=3D$(pwd)/vroot || (cat build/mes= on-logs/meson-log.txt && exit 1) - - ninja -C build install-web - - mv vroot/share/doc/libvirt/html/ website + - meson setup build --werror -Dsystem=3Dtrue || (cat build/meson-logs/= meson-log.txt && exit 1) + - DESTDIR=3D$(pwd)/install ninja -C build install-web + - mv install/usr/share/doc/libvirt/html/ website artifacts: expose_as: 'Website' name: 'website' --=20 2.35.3