From patchwork Wed Feb 3 10:09:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Federico Pellegrin X-Patchwork-Id: 1435203 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) 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=Ck29L5VJ; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DVy996TQRz9tkx for ; Wed, 3 Feb 2021 21:10:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E28E285EF1; Wed, 3 Feb 2021 10:09:57 +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 4yMrWtyVHIne; Wed, 3 Feb 2021 10:09:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7AFE984E5E; Wed, 3 Feb 2021 10:09:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 436071BF977 for ; Wed, 3 Feb 2021 10:09:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 38EB7864CB for ; Wed, 3 Feb 2021 10:09:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FdjWIlJRwneM for ; Wed, 3 Feb 2021 10:09:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by whitealder.osuosl.org (Postfix) with ESMTPS id A970C85B5D for ; Wed, 3 Feb 2021 10:09:43 +0000 (UTC) Received: by mail-ej1-f48.google.com with SMTP id p20so15391791ejb.6 for ; Wed, 03 Feb 2021 02:09:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9lFGqlLldVohzvuiB0noKLPjnAXYjlQE+JGgYKYZazI=; b=Ck29L5VJ0eTHHbhwAvN06Z778wVpEz4d17h2LeZrahZABgyZw6aEgyMVBjG4ZeI1wr xuKIKBCGJ1cF2Es83VWz9Kho97esylQEonez2q/H4cVHoxzqIHDz3UkMkwY3DDxMfINH qk/o5RNJ4lbikgxflYVXQluvazrdLuhebZv4vuYVxpaTUn58j6Xq6oSmrknsu3H2yJoG hAs+4pK9Nnx5b/CGVQkdSLiIO1STLDAWbzFbORCg0xAK8JmmVLenxzKN+OtTUQtKONhr G5J8pJ4iLR0pEV2P6yheriXVPJOEjEpUxDvwF7QIhIzSNk84pM9AwxFjrlFfzYSJxjos 019Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=9lFGqlLldVohzvuiB0noKLPjnAXYjlQE+JGgYKYZazI=; b=GWU4Z+fAVX3Ikalpl8nYV9FG7LbqOrMn2RXVy6i1tbbISWrkHByUAJkjunjVmyogTv oS489pNaYJRiZEt/P+Jn5Vj15TU5hCArN7tKuQ2ohRdj9wZpFEANMYZcq6tZY64WFn+m bPCHn6eDiooqKJ+il5eod7ejZd5UgkNwXjcizxL1pMMuP5dlVTkdoTTRBmvKFoc7+q67 giH4T2mtuuHYpFepFS/z/3CBd6AlQr7OuDkPRzMN3+MqOvCTapfQLB3/jwG2fIlrTWwA jMzSaSKFA+wgbPFHUqR5Q+S0RX7YG8/mn5RD0Oz0AIUPqgfAKF8DRS5MkND6st6TIuyf c/wg== X-Gm-Message-State: AOAM532hHdoCU9hhQiWz2cuiO5pQbPnJiiIUH65xxcHTjvBZO0vlCR1n P7BW7+aLkPS9tJPFg99EbwZ7ARE135U1SQ== X-Google-Smtp-Source: ABdhPJzRLRrH5y7W9cQZ+hNBQ4lfVjgehDai6bvVe3hJbt06fEcEOJQKAy++sszi+iVyjW61+kMI2Q== X-Received: by 2002:a17:906:798:: with SMTP id l24mr2520770ejc.92.1612346982246; Wed, 03 Feb 2021 02:09:42 -0800 (PST) Received: from grootbook.fritz.box ([2a02:2455:e61:2400:c08c:93f1:67a1:cb8e]) by smtp.gmail.com with ESMTPSA id q16sm775949ejd.39.2021.02.03.02.09.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 02:09:41 -0800 (PST) From: Federico Pellegrin To: buildroot@busybox.net Date: Wed, 3 Feb 2021 11:09:39 +0100 Message-Id: <20210203100939.17390-1-fede@evolware.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/kexec: fix build on pre 4.4 kernels 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: Federico Pellegrin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" kexec build will fail on older kernels (pre 4.4) as the define VIDEO_CAPABILITY_64BIT_BASE was not present at that time. This patch adds it, as per linux/include/uapi/linux/screen_info.h, if not present. Signed-off-by: Federico Pellegrin --- ...c-tools-fix-build-on-pre-4.4-kernels.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/kexec/0003-kexec-tools-fix-build-on-pre-4.4-kernels.patch diff --git a/package/kexec/0003-kexec-tools-fix-build-on-pre-4.4-kernels.patch b/package/kexec/0003-kexec-tools-fix-build-on-pre-4.4-kernels.patch new file mode 100644 index 0000000000..fcac604dfd --- /dev/null +++ b/package/kexec/0003-kexec-tools-fix-build-on-pre-4.4-kernels.patch @@ -0,0 +1,34 @@ +From cbbe4c47cb2acae04083c510dbe0efc5f48f5bb6 Mon Sep 17 00:00:00 2001 +From: Federico Pellegrin +Date: Wed, 3 Feb 2021 11:00:17 +0100 +Subject: [PATCH] kexec-tools: fix build on pre 4.4 kernels + +kexec build will fail on older kernels (pre 4.4) as the define +VIDEO_CAPABILITY_64BIT_BASE was not present at that time. + +This patch adds it, as per linux/include/uapi/linux/screen_info.h, +if not present. + +Signed-off-by: Federico Pellegrin +--- + kexec/arch/i386/x86-linux-setup.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c +index 76e1185..ab54a4a 100644 +--- a/kexec/arch/i386/x86-linux-setup.c ++++ b/kexec/arch/i386/x86-linux-setup.c +@@ -37,6 +37,10 @@ + #include "x86-linux-setup.h" + #include "../../kexec/kexec-syscall.h" + ++#ifndef VIDEO_CAPABILITY_64BIT_BASE ++#define VIDEO_CAPABILITY_64BIT_BASE (1 << 1) /* Frame buffer base is 64-bit */ ++#endif ++ + void init_linux_parameters(struct x86_linux_param_header *real_mode) + { + /* Fill in the values that are usually provided by the kernel. */ +-- +2.26.2 +