From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 988416FD3 for ; Sat, 17 Aug 2024 09:48:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723888105; cv=none; b=iisHWlWC4Z5QvQqgtb1i0RFYGzh9X9VqT62U7D6UzOzHEACNUHMqOADRUk3HXebdtT/3535WV/eCZt+GWAmrPEpJs9+nmtZrURDLzAOGAYhRxwBpt1shfDiycXrH9lSSAgfZei4aim62X9j2mqzQgyTP37IlTcXH7MMtFdyI2TU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723888105; c=relaxed/simple; bh=AZx2BJBXH8oQq7xdyF9rrqUH+UIpxBGVygKCLrGYUlM=; h=Mime-Version:Content-Type:Date:Message-Id:To:Cc:Subject:From: References:In-Reply-To; b=EaZQsglOlKGfUt5tk0a2t/DlLVJ7HkGJjIyBXRjgP29zmqtBVWUFfy0PP1bdRtNdeNKASUoe3J4ceWKiTN4FDwQEaeBUIr4LIkGgiWOIEQUy8ui6Vi1aBo2R6HO1AJcVH0hHctcSdAfZf2vPUyKEdh2i6e3mKmxdDsFofE+DdKg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com; spf=pass smtp.mailfrom=fairphone.com; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b=nu/O0F34; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fairphone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="nu/O0F34" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2ef2fccca2cso31380601fa.1 for ; Sat, 17 Aug 2024 02:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1723888102; x=1724492902; darn=vger.kernel.org; h=in-reply-to:references:from:subject:cc:to:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=350RyIMKXGOQLd/8HTZr3pRXPYZz9XbRH5Vw+7o+H40=; b=nu/O0F34jB1ZW2kCAdf23PO7x4QFVu9KeHT0q5bfOC1hEkMcu6Gd8bU53YdBcjtarG tqaEYWucfci+eSkxiXvtQs14MTiB8zQMfWi9L7zL4cM4EJFGbWUdbwAHTe2BRbDMERxI BSr3o365xwZFvjO/UEAEci4eQJxr+bIhtVQl4iutRMxQfuw2u3PxDsJnH/M/SUKFQHKG cAqaEk5QP2GKtKp8qbKiTeZaArSvU5ArA3rBWj3k3AUzpowGTJ8viJ+GOHpz9X/pcQeA Xcz08Wcl3+nTMJB6JhziQNf5+gHfh1Kwips7pugKog2E9cgBuyZ7gq0LYaCpBqLRW07O Cdrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723888102; x=1724492902; h=in-reply-to:references:from:subject:cc:to:message-id:date :content-transfer-encoding:mime-version:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=350RyIMKXGOQLd/8HTZr3pRXPYZz9XbRH5Vw+7o+H40=; b=n7dlUElk79Eowc4CzzxFRGqV5hWB64mpCX/dF2dbDnneuut519BvR8Suh5XzUFdVr2 xyEZlJh2O4AXPgcDsjbJYDgCNkGUiyjYbxuWyTkw2FGHPaTPYGBjmHQJ1uk1gL7eCg75 1WmX0SOHbAXRRS82ylTeCrtam8I1JtvHi+K5M7b0eCuxTzpB8N8upFEvVOl7AO7AtnLk CyqNXe50gnWhGpSmecABHnffMwAg/V5gI3NV5CyxC/bC2bqTDbm52IUlGeJX8vjuHqdo pp+MaQhXAR6jAu9WdwfCRRZCqa9NTcgoz/2q8B84aU33k8SAIo9O/+8P80QuyUOL+xWr kEAw== X-Gm-Message-State: AOJu0YzVQZgTWaBkXJoe1WTXhiK+xHKpc2A+AhjFpuzSAmh3NT8xaf1r jBn8JRQ5LOUz+eu7AWVm/CByQpZxwtSLGFAkrhsO8dzOEo7+MHE8BY4YazJiO0k= X-Google-Smtp-Source: AGHT+IHqnXF5BOfwuJW2UnmBiqatHyT9kJAyaAOLERxfSFlVm4kaSkuz6kKxlR9v7OJqRmYcz5htpg== X-Received: by 2002:a2e:a490:0:b0:2f2:b2f7:c8a3 with SMTP id 38308e7fff4ca-2f3c91334ffmr10398731fa.44.1723888101375; Sat, 17 Aug 2024 02:48:21 -0700 (PDT) Received: from localhost ([194.95.66.31]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4ccd6e96d61sm1829227173.67.2024.08.17.02.48.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 17 Aug 2024 02:48:20 -0700 (PDT) Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sat, 17 Aug 2024 11:48:14 +0200 Message-Id: To: , "Max Krummenacher" Cc: , "Greg Kroah-Hartman" , "Jiri Slaby" , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , , Subject: Re: [PATCH] tty: vt: conmakehash: cope with abs_srctree no longer in env From: "Luca Weiss" X-Mailer: aerc 0.18.2-0-ge037c095a049 References: <20240725132056.9151-1-max.oss.09@gmail.com> In-Reply-To: <20240725132056.9151-1-max.oss.09@gmail.com> On Thu Jul 25, 2024 at 3:20 PM CEST, max.oss.09 wrote: > From: Max Krummenacher > > conmakehash uses getenv("abs_srctree") from the environment to strip > the absolute path from the generated sources. > However since commit e2bad142bb3d ("kbuild: unexport abs_srctree and > abs_objtree") this environment variable no longer gets set. > Instead use basename() to indicate the used file in a comment of the > generated source file. > > Fixes: 3bd85c6c97b2 ("tty: vt: conmakehash: Don't mention the full path o= f the input in output") > Signed-off-by: Max Krummenacher > > --- > > drivers/tty/vt/conmakehash.c | 20 +++++++------------- > 1 file changed, 7 insertions(+), 13 deletions(-) > > diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c > index dc2177fec715..82d9db68b2ce 100644 > --- a/drivers/tty/vt/conmakehash.c > +++ b/drivers/tty/vt/conmakehash.c > @@ -11,6 +11,8 @@ > * Copyright (C) 1995-1997 H. Peter Anvin > */ > =20 > +#include > +#include Hi Max, Not sure this is the best place to ask but this include appears to rely on this file already being installed in /usr/include and is not taken from the Linux source tree that's being built. This mostly manifests in building Linux kernel e.g. in Alpine Linux package build if 'linux-headers' package is not being explicitly installed, failing with=20 drivers/tty/vt/conmakehash.c:15:10: fatal error: linux/limits.h: No such = file or directory 15 | #include | ^~~~~~~~~~~~~~~~ compilation terminated. Apparently this is (understandably) also a problem when building on macOS: https://lore.kernel.org/all/20240807-macos-build-support-v1-11-4cd1ded85694= @samsung.com/ I did try that linked patch a bit ago, but unfortunately didn't fix it for the Alpine Linux build environment. Any ideas? Regards Luca > #include > #include > #include > @@ -76,8 +78,8 @@ static void addpair(int fp, int un) > int main(int argc, char *argv[]) > { > FILE *ctbl; > - const char *tblname, *rel_tblname; > - const char *abs_srctree; > + const char *tblname; > + char base_tblname[PATH_MAX]; > char buffer[65536]; > int fontlen; > int i, nuni, nent; > @@ -102,16 +104,6 @@ int main(int argc, char *argv[]) > } > } > =20 > - abs_srctree =3D getenv("abs_srctree"); > - if (abs_srctree && !strncmp(abs_srctree, tblname, strlen(abs_srctree))= ) > - { > - rel_tblname =3D tblname + strlen(abs_srctree); > - while (*rel_tblname =3D=3D '/') > - ++rel_tblname; > - } > - else > - rel_tblname =3D tblname; > - > /* For now we assume the default font is always 256 characters. */ > fontlen =3D 256; > =20 > @@ -253,6 +245,8 @@ int main(int argc, char *argv[]) > for ( i =3D 0 ; i < fontlen ; i++ ) > nuni +=3D unicount[i]; > =20 > + strncpy(base_tblname, tblname, PATH_MAX); > + base_tblname[PATH_MAX - 1] =3D 0; > printf("\ > /*\n\ > * Do not edit this file; it was automatically generated by\n\ > @@ -264,7 +258,7 @@ int main(int argc, char *argv[]) > #include \n\ > \n\ > u8 dfont_unicount[%d] =3D \n\ > -{\n\t", rel_tblname, fontlen); > +{\n\t", basename(base_tblname), fontlen); > =20 > for ( i =3D 0 ; i < fontlen ; i++ ) > {