From patchwork Thu Jul 21 04:19:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 40804 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A4A0F27BBEA; Thu, 21 Jul 2022 05:20:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5C66427BBE9 for ; Thu, 21 Jul 2022 05:20:21 +0100 (BST) Received: from localhost ([::1]:38496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oENfg-0007GZ-I7 for patchwork@mira.cbaines.net; Thu, 21 Jul 2022 00:20:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oENfT-0007Do-AJ for guix-patches@gnu.org; Thu, 21 Jul 2022 00:20:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oENfO-0002HE-HZ for guix-patches@gnu.org; Thu, 21 Jul 2022 00:20:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oENfO-0001B4-CN for guix-patches@gnu.org; Thu, 21 Jul 2022 00:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56677] [PATCH 1/2] gnu: Add glibc-for-fhs. References: <1LCXD7_zuGflSFovh_mKvhdayNcoWp8ALeguq3i2-XWwWHgzZuPak2gSBN91VLNJ84lubuFAt1dPB282Zy0pBmh_zbiI2qI-7n0LP9F03u4=@protonmail.com> In-Reply-To: <1LCXD7_zuGflSFovh_mKvhdayNcoWp8ALeguq3i2-XWwWHgzZuPak2gSBN91VLNJ84lubuFAt1dPB282Zy0pBmh_zbiI2qI-7n0LP9F03u4=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Jul 2022 04:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "56677@debbugs.gnu.org" <56677@debbugs.gnu.org> Received: via spool by 56677-submit@debbugs.gnu.org id=B56677.16583771754465 (code B ref 56677); Thu, 21 Jul 2022 04:20:02 +0000 Received: (at 56677) by debbugs.gnu.org; 21 Jul 2022 04:19:35 +0000 Received: from localhost ([127.0.0.1]:36416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oENex-00019x-BI for submit@debbugs.gnu.org; Thu, 21 Jul 2022 00:19:35 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:60437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oENev-00019j-6V for 56677@debbugs.gnu.org; Thu, 21 Jul 2022 00:19:34 -0400 Date: Thu, 21 Jul 2022 04:19:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1658377166; x=1658636366; bh=E4XPt6GUNF5K7mvB6YU6AXhVsWBhdoXXLhzTaqM3uTc=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=pxDIJfiWu0wTgSf50eVIhy6gAu8D8xC2eyRdy1xkQrPqisGTCfKmdw8LS0sSWzHZl lf1z4BAos1uZuMaLvNO0s61HODHGHnTm7KLyUQG9kdVTAgkEf+eufga0BDGaBcuz31 /40bZykSCC/VQ0Q8yqJYZ0Hp33K0bORNiBqLr4egYwZ+pYNWvRNM64qAipRBrrjA6a QECpEIhfZGOPtiaEeJxjovwjzxfPLVRKVMp91MD7lmmX7ylmJDsXPb+u1/zv1AwChu LmED4z51lhEGVD0lJcTGZf4w0yn74qMwqW+jxYcI7ILwihRjDmK+Ugy0mSrWFaJZUB f23tzp51B1zUQ== Message-ID: Feedback-ID: 7805494:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From ac94f4203423c625c06018212677a798ea46b417 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 20 Jul 2022 23:26:53 -0400 Subject: [PATCH 1/2] gnu: Add glibc-for-fhs. * gnu/packages/base.scm (glibc-for-fhs): New variable. Hidden package for use in forthcoming --emulate-fhs option for guix containers. --- gnu/packages/base.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 4bdc3e7792..b566057b41 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -928,6 +929,20 @@ (define-public glibc (license lgpl2.0+) (home-page "https://www.gnu.org/software/libc/"))) +;; Define a variation of glibc which uses the default /etc/ld.so.cache, useful +;; in FHS containers. +(define-public glibc-for-fhs + (hidden-package + (package + (inherit glibc) + (name "glibc-for-fhs") + (source (origin (inherit (package-source glibc)) + ;; Remove Guix's patch to read ld.so.cache from /gnu/store + ;; directories, re-enabling the default /etc/ld.so.cache + ;; behavior. + (patches (delete (car (search-patches "glibc-dl-cache.patch")) + (origin-patches (package-source glibc))))))))) + ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) (define-public glibc-2.32 -- 2.37.0