From patchwork Mon Apr 12 12:53:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1465250 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FJpb742Dzz9sX3; Mon, 12 Apr 2021 22:54:10 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lVw4q-0006sj-FM; Mon, 12 Apr 2021 12:54:04 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lVw4m-0006rd-QB for kernel-team@lists.ubuntu.com; Mon, 12 Apr 2021 12:54:00 +0000 Received: from mail-ej1-f71.google.com ([209.85.218.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lVw4m-0000vT-I7 for kernel-team@lists.ubuntu.com; Mon, 12 Apr 2021 12:54:00 +0000 Received: by mail-ej1-f71.google.com with SMTP id pj13so3835169ejb.10 for ; Mon, 12 Apr 2021 05:54:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QETqILPuhvzDLXTz+cvX5x1mdN/wUgSvD4OYmqsXqXk=; b=ARPPiVRkmV2yPkh9aM3Y958SPEjIqZBrLb92Ze2UwxN0Wd6dG0OwL/JPEeoY5EizrK Ov9ejnhf4IRx82oFfWxuMwe9fmcDPrDigOASLjwV9XrUOaV7IUGElz5C0bOlDvGW2VNo mUxs7vx9v9FGQqNqSj7GFe1IYoFBZ/wzO7Ep7rCiaQZsmspbgK09BhBPrDxa+Aprn46a p4IempWCDJHQMrWMCKgmeP2Ff68iYKYWzFrS6Qri5uPltIu7GNcXoBYVz/p0UZuHjvw8 lazwwG5nhN4WNSv3SUkLejnE6YCzq5A13faQqarLV9pGnIsYNvMiyJBy9IGbsDoii01v sPVw== X-Gm-Message-State: AOAM530kycRgHFaOa76ATMGVNhQiYlHQ58TtgOtEmBV3RlcNvppVEuBM EM5XL4jOBdgPv42ERlKPT8A0rNOS5d69TasgwXPekdTSvBLKrNU8tLckTDo+2ecaxd30hyb572B f/I8Tcdn0hglNerH2a3gZXADEqc5Ag2fZOUd7/sSElA== X-Received: by 2002:aa7:d691:: with SMTP id d17mr20852922edr.291.1618232040218; Mon, 12 Apr 2021 05:54:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwB/DtyTDKqGrE80f+9o+OfP4IDjJOpEXXSIuuyCpb+VT++KAXYCOrJ9Gjt9eF1tGEAJZLHZw== X-Received: by 2002:aa7:d691:: with SMTP id d17mr20852913edr.291.1618232040090; Mon, 12 Apr 2021 05:54:00 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id z20sm6687413edd.0.2021.04.12.05.53.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 05:53:59 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 1/3] UBUNTU: [Packaging] Drop versioned ABI directory names Date: Mon, 12 Apr 2021 14:53:56 +0200 Message-Id: <20210412125358.23098-2-juergh@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210412125358.23098-1-juergh@canonical.com> References: <20210412125358.23098-1-juergh@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Versioned ABI directory names are not really necessary and make it difficult to follow the ABI history due to directory name changes between releases. So use directory names 'current' and 'previous' instead. Signed-off-by: Juerg Haefliger --- debian/rules.d/0-common-vars.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index f642cda1a185..c3e417e242e4 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -125,8 +125,8 @@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)- endif -abidir := $(CURDIR)/$(DEBIAN)/abi/$(release)-$(revision)/$(arch) -prev_abidir := $(CURDIR)/$(DEBIAN)/abi/$(release)-$(prev_revision)/$(arch) +abidir := $(CURDIR)/$(DEBIAN)/abi/current/$(arch) +prev_abidir := $(CURDIR)/$(DEBIAN)/abi/previous/$(arch) commonconfdir := $(CURDIR)/$(DEBIAN)/config archconfdir := $(CURDIR)/$(DEBIAN)/config/$(arch) sharedconfdir := $(CURDIR)/debian.master/config