From patchwork Thu Apr 9 20:45:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2921 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48ytSq3YTjz3yBt for ; Thu, 9 Apr 2020 20:45:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48ytSn6JQdzdq; Thu, 9 Apr 2020 20:45:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48ytSn4yd9z2yN4; Thu, 9 Apr 2020 20:45:29 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48ytSm1BPfz2yC3 for ; Thu, 9 Apr 2020 20:45:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48ytSl4JPrzdq; Thu, 9 Apr 2020 20:45:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1586465127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=bTk6m02umCHswzl5TTc3HU1krjSrWCh67qB+55zx6Ys=; b=/Gj5nF6mEg51mrG8QzHCLKuL0rNrQXJIceLOlgvf4enwdLIZMsoXzXfIcYLfWt3EakqvmU 6fGiFLJtTTdPuZBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1586465127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=bTk6m02umCHswzl5TTc3HU1krjSrWCh67qB+55zx6Ys=; b=FIHfsHbOlSNpR8KjjN7Mxx5v98/XfQEEnMqLJTBK5pnwJDgCkKN3oT0XqTsiiF8jOGIirk H3wD7eklAJ6Zy3HFxwv+pFIksTOUDOj0wzGpVMm/1eUWXNdJVl0FjBehprzudF+O/Q7JPL X/BGwYbtSsp7YbE7HxDygJpbVVnXJuaEwj4a8pEwNBilMe39JoUNh+M44yjiM46AnR5tTg /Yq1cn9F1U/Bd2lAtSq9uwhakoNEy41ZSMOioiBby7+eFprK8oG1DfTp29lYvK8WOM86+4 oz4pVE3Bxy0ToFaeAQApk6z6xedv7WXGaDEU9b1BX8CM/vqvuhHHyndhKZH38w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] Add /etc/os-release Date: Thu, 9 Apr 2020 20:45:16 +0000 Message-Id: <20200409204516.4708-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This file is being read by some packages to find out on what distribution they are running on. This file needs to be included in every Core Update. Signed-off-by: Michael Tremer --- config/rootfiles/common/aarch64/stage2 | 1 + config/rootfiles/common/stage2 | 1 + config/rootfiles/common/x86_64/stage2 | 1 + lfs/stage2 | 9 +++++++++ 4 files changed, 12 insertions(+) diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2 index f4169a44e..82e2c20d0 100644 --- a/config/rootfiles/common/aarch64/stage2 +++ b/config/rootfiles/common/aarch64/stage2 @@ -28,6 +28,7 @@ etc/modules.conf etc/mtab etc/nsswitch.conf #etc/opt +etc/os-release etc/passwd etc/profile #etc/profile.d diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index fca540431..8067df39b 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -28,6 +28,7 @@ etc/modules.conf etc/mtab etc/nsswitch.conf #etc/opt +etc/os-release etc/passwd etc/profile #etc/profile.d diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index cc67837e5..026532b8f 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -28,6 +28,7 @@ etc/modules.conf etc/mtab etc/nsswitch.conf #etc/opt +etc/os-release etc/passwd etc/profile #etc/profile.d diff --git a/lfs/stage2 b/lfs/stage2 index 355aeef54..d6012b85e 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -145,6 +145,15 @@ endif # System release echo "$(SYSTEM_RELEASE)" > /etc/system-release + # OS release + : >/etc/os-release + echo "NAME=\"$(NAME)\"" >> /etc/os-release + echo "VERSION=\"$(VERSION)\"" >> /etc/os-release + echo "ID=$(SNAME)" >> /etc/os-release + echo "VERSION_ID=2" >> /etc/os-release + echo "PRETTY_NAME=\"$(SYSTEM_RELEASE)\"" >> /etc/os-release + echo "ANSI_COLOR=\"0:31\"" >> /etc/os-release + # Pakfire -mkdir -pv /opt/pakfire/db/core echo "$(CORE)" > /opt/pakfire/db/core/mine