From patchwork Thu Feb 6 09:36:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1234187 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=upEQEhsS; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Ctcn30k8z9sRK for ; Thu, 6 Feb 2020 20:37:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3C71D214D2; Thu, 6 Feb 2020 09:37:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C3xOVsRJlH4f; Thu, 6 Feb 2020 09:37:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A57C721546; Thu, 6 Feb 2020 09:37:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 39CE11BF9B5 for ; Thu, 6 Feb 2020 09:36:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 34C0184836 for ; Thu, 6 Feb 2020 09:36:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pdXs7uCKQ5EU for ; Thu, 6 Feb 2020 09:36:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9C0FD85EC4 for ; Thu, 6 Feb 2020 09:36:55 +0000 (UTC) Received: by mail-wm1-f47.google.com with SMTP id s10so5499629wmh.3 for ; Thu, 06 Feb 2020 01:36:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DVJ6uzFuwK3P1gk23i9rGJKK2ym+q/1HemkREy4bLnE=; b=upEQEhsSMyM4mZ0rSd63dq19DCUkUPdlyk04ETHaKfPim94h3JXogYWzEOPy0xiSlv 0uvZW+PLuG7wTpMKDgDRKdH8w4F3evWOFb1ujxvrenIYOLkzM1erxX46bZN+ctffCTW7 DEtbguIz80Zqc13ofytbLgx1/E7zJwDqf5jap+AaP+nVKWn2OEdZl6ctBc+poKWVhLx6 UGc7gEHBBgmHkpDZQiKVw/Uvt68ru0CcgQ8dHsBev1YUs+1L3k4OlWyltFS2+sd/59j+ VC3dxnPD8/EhimfBDFCIEtHdAY3AfP+uFiqyCeieNqWt8mTbu2NLhB5vNT23iBG3g7Dd hZuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DVJ6uzFuwK3P1gk23i9rGJKK2ym+q/1HemkREy4bLnE=; b=V8sRero2E8uUQvjcjIX0aLAkW4KOCpzNLaJir1G8Es6bSxCL8fQYYUU6Sl0nTgeilu 89VJ5iRXuLx35LmqyZvDDGuOSXBRAhy1Mx6eT4/Yn3n2Zv9l/eq+uwh4N81EB8eQU/Jo QDzwWFcm9XTKypcF/dUSxY9Q7wq9KQRwZ2ldrDRvqTVbYXeqaw0bt74Inj9/BvhYfEE4 ADSWRE/bVGwguZBj9IrfQo25D/4p6UdbE4HeSeRwWCsevuJYVZTh8sIMS5r+8cG8lmXN pDF1L3qJC7y28pTcAtgZxC70GVm9PMtkpoZ5K15lCaVnwJ7cz/xmOwtiQtvU2RZYtldb klYg== X-Gm-Message-State: APjAAAUVasBl6OfM7K53WX88vlLdbB9yS3R5NWpFK/5VRn176qQ8w7+i kkz6rAbYP8xp/fKCYXFNPQzkTQjmTUg= X-Google-Smtp-Source: APXvYqzIl90Uw/+pcXNnj1RLLs0s1aKSlrKTL1hTzLMtaGnEytvlLT2/X/eu15O0tAnyiatbC/y+lg== X-Received: by 2002:a1c:4c5:: with SMTP id 188mr3464957wme.82.1580981813880; Thu, 06 Feb 2020 01:36:53 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id a9sm2873596wmm.15.2020.02.06.01.36.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 01:36:53 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 10:36:30 +0100 Message-Id: <20200206093633.251413-8-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206093633.251413-1-nolange79@gmail.com> References: <20200206093633.251413-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 07/10] Makefile: Handle systemd catalogs in PURGE_LOCALES X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Norbert Lange Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" journald supports localization with Catalog files with a naming scheme ..catalog. We want to purge them like other locales. Signed-off-by: Norbert Lange --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index a52f1c75fd..e6890e13c4 100644 --- a/Makefile +++ b/Makefile @@ -701,6 +701,14 @@ define PURGE_LOCALES fi \ done; \ done + for cfile in $(wildcard $(TARGET_DIR)/usr/lib/systemd/catalog/*.catalog); \ + do \ + basename=$${cfile##*/}; \ + basename=$${basename%.catalog}; \ + langext=$${basename#*.}; \ + [ "$$langext" != "$${basename}" ] || continue; \ + grep -qx "$${langext}" $(LOCALE_WHITELIST) || rm -f "$$cfile"; \ + done if [ -d $(TARGET_DIR)/usr/share/X11/locale ]; \ then \ for lang in $(LOCALE_NOPURGE); \