From patchwork Mon Oct 8 11:20:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 980504 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="k3u2naiP"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IEaispGe"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42THzD41mqz9sBk for ; Mon, 8 Oct 2018 22:23:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=B6QWKFQC+JFl73YxsxzkU1zb3i2Xs99vNfBptFn8DLQ=; b=k3u2naiPb5cNb+ ShrMsE+vYlOmJ6bKI2KairkTpVoz5E+DTcmYa7bid1KuIXFaftPMyU19YJu39nw7yO4I+3apSejnl 8Zefvp+YREI3O2MJAzpVcx0BUkJzb+agSvI0HQav/VgongLfUwB1E04GRI7wIUQtHYQTzJtiAxzNc ri9591KXqXlh18Iza8yb4397hWAxhrtXELaL/63Yc7iAIiFyi6Fp+w7p1f+SDHVLR2i/Yqxzl4oUQ T+5RlMIcS5KG3sICBHWAvxLnwNtjgcsfNzOa3tiWD/k/SFdqQh0mEUAEDRe1RrsTVG2pxmzptgtE2 dJGWNlJcxpayqijNbpbQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g9Tcj-0006o7-SL; Mon, 08 Oct 2018 11:22:53 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g9Tal-0006cL-1K for openwrt-devel@lists.openwrt.org; Mon, 08 Oct 2018 11:22:51 +0000 Received: by mail-lj1-x244.google.com with SMTP id r8-v6so17457913ljc.10 for ; Mon, 08 Oct 2018 04:20:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=b4wkTgIxhEG0M9JNnDqSuqd07iSSvZVKDAfhLsMWcso=; b=IEaispGer1tcic1V5LH13WqX6/HR5cbQnCcD8gXpc54sKfZKM3VsMH5/TJj6LbVia9 tDrvmRvS7kxjSnKCFiBz+kWm3s8RwuHqOKqc7kqlb+ff5tcIqkUXoEHfZ0fH4i6BNjbC /bnIOoupGEbwFdPzZYLlkviNsSI00g4g0e4KwNo34N9hkAjKtPhb6ao03drHWt0Ersu1 O9ifDUGpeqashsZ5jmxisYSIkLEQ+9dwWTsSq2IZ5Un0fp02W3BkUMltMRyH/G+2pC2D uLhoC8eO+xJC33jcJCSLEuUADdonFSQ+FrRSgxHEDtXCYqjrjRzdUPpuD9RGxWFms6B6 66qg== 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:mime-version :content-transfer-encoding; bh=b4wkTgIxhEG0M9JNnDqSuqd07iSSvZVKDAfhLsMWcso=; b=YNsjSkz6rdK5O3y/lwM+mdW3c5mvT3mXAIf31Ydh3DZK5N04AOUkf7atKjXJygG0wm p+ZNR7okvckq8z3YV7/l8BmgTOekhQUhJouT6YxjYc2XzxjHhVljCHLQjhZ+ScZNRuNN miCf/4cyNIojbCWaaDlyecrDiA0GE/j9lUlHRmIoDKocjHVr0Gi7aUutI7LZdhD8jxrc hsQ5oYogC5xxJbsgS1vCe3WNpWXKjnpyyjmXvjsTDPAdsFs4hp3Dxg6s+NbPUtk7yD0U NqmFXLRA9X/ueJW2ez5llXFftqN7Q5xA1fxtJhmpNOR3BkjNTB8PW5phdt6lB+hDeFgu HFHg== X-Gm-Message-State: ABuFfoich31XYssDZMIlqMe3KXKnrW7aIHeKM70dlA2/qbcQzcla9ST3 Te2Fr1ba2xoOboEXOyOTY9V8kAxe X-Google-Smtp-Source: ACcGV62BSlu1X0jQH36XeX/JqazqrVqL6qNEhgvlARrgWTW3AS30ekdRVQ6BIWf4dFXE5069yG920Q== X-Received: by 2002:a2e:8743:: with SMTP id q3-v6mr9496820ljj.80.1538997637843; Mon, 08 Oct 2018 04:20:37 -0700 (PDT) Received: from linux-veee.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id 2-v6sm3426880ljv.83.2018.10.08.04.20.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Oct 2018 04:20:37 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Date: Mon, 8 Oct 2018 13:20:19 +0200 Message-Id: <20181008112019.32181-1-zajec5@gmail.com> X-Mailer: git-send-email 2.13.7 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181008_042051_136820_4AD380F3 X-CRM114-Status: UNSURE ( 9.82 ) X-CRM114-Notice: Please train this message. X-Spam-Note: SpamAssassin invocation failed Subject: [OpenWrt-Devel] [PATCH] kernel: fix downloading rcX releases X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki They are no longer stored in the "testing" subdirectory and are not available as .tar.xz archives. If -rc is detected download it from the git.kernel.org and use .tar.gz. Signed-off-by: Rafał Miłecki --- include/kernel-defaults.mk | 10 ++++++++-- include/kernel.mk | 14 ++++++++++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 5e905a2faa..cc1e2361be 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -21,16 +21,22 @@ export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include # defined in quilt.mk Kernel/Patch:=$(Kernel/Patch/Default) +ifneq (,$(findstring .xz,$(LINUX_SOURCE))) + LINUX_CAT:=xzcat +else + LINUX_CAT:=zcat +endif + ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"") define Kernel/Prepare/Default - xzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) + $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) $(Kernel/Patch) $(if $(QUILT),touch $(LINUX_DIR)/.quilt_used) endef else define Kernel/Prepare/Default - xzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) + $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) endef endif else diff --git a/include/kernel.mk b/include/kernel.mk index c169550f48..ee3e590954 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -59,10 +59,16 @@ else LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux - LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.xz - TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,) - ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) - LINUX_SITE:=@KERNEL/linux/kernel/v$(word 1,$(subst ., ,$(KERNEL_BASE))).x$(TESTING) + ifneq (,$(findstring -rc,$(LINUX_VERSION))) + LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.gz + else + LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.xz + endif + + ifneq (,$(findstring -rc,$(LINUX_VERSION))) + LINUX_SITE:=https://git.kernel.org/torvalds/t + else ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) + LINUX_SITE:=@KERNEL/linux/kernel/v$(word 1,$(subst ., ,$(KERNEL_BASE))).x else LINUX_UNAME_VERSION:=$(strip $(shell cat $(LINUX_DIR)/include/config/kernel.release 2>/dev/null)) endif