From patchwork Mon Jul 10 22:14:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 786401 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x5zzY5c7lz9s7m for ; Tue, 11 Jul 2017 08:15:05 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f3dDcP1H"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EE4D185A97; Mon, 10 Jul 2017 22:15:02 +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 UoPY1fONoTdh; Mon, 10 Jul 2017 22:15:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 67B6586891; Mon, 10 Jul 2017 22:15: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 559421C03E7 for ; Mon, 10 Jul 2017 22:14:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3D56C85A97 for ; Mon, 10 Jul 2017 22:14:59 +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 9pDbwQi2uyd0 for ; Mon, 10 Jul 2017 22:14:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 28AF3868DE for ; Mon, 10 Jul 2017 22:14:58 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id z45so28114831wrb.2 for ; Mon, 10 Jul 2017 15:14:58 -0700 (PDT) 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:in-reply-to :references:content-transfer-encoding; bh=DP92VNL9bQEtGm3xXPpO64aVJO4XTQDibeuQ/NnNBRo=; b=f3dDcP1HTmk8bEmNmDXLa6AH9WazcDn1c/YYJH9Obp3oQrtjcGxcrpJPeQ1hJF6xk5 Ya9tEEeQc+YdtL7JWUBwVQEFRcjKPxUiTFlGtGosjy917aDj0Tv7GWbTovPg97HJ/+9N UQZ2QokHLVVB1KN0osZaY3i3eOrDrHfD8KtRqnPZZeHD1/4sQlgI3P/qQhwajF8ZFKIR hCLnJvcHBdakvGxakJx09KSOhvFRoOb3iRlorVEg42pveY/Ix8Y2iXlMAJZwtWVuzBYO 1TuN6ZNlG64FQafEU/LQjBz1hMPuPDvPoE7R5pyWWLfFoEQlu0nrRWdLm3cI4WClDZFM enZg== 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:in-reply-to:references:content-transfer-encoding; bh=DP92VNL9bQEtGm3xXPpO64aVJO4XTQDibeuQ/NnNBRo=; b=rdptGL8A3ngVK2DGjry8QC40iBdcDpHwbaCFvqqE0lV+zIiMi7e5mv9jpokjFNf4UB Y4XAvqTswZUHdAkewvMQ4VPjy5sTS4OkYBbWYTmATUzka24fC6nqVAISmXK+/ZNf4X+a ylM8NQFj5FrSlzeTLbwunkCuYu7kNonwlIinkGgGXUk7MFJpaeRkuVQQS7Y2NULHdguI lNI7KwwimuxUmG0rNa7yKmmLwp5IUpP9b529pu3SpbSNuvaArs8VNL68t/14ehyuETPh 3dqevl/mZJWr1S97/CD3TJ6yOF+CBIm0T5xxt6DJcSKYFTBauhw/4NUdVdDoKou2Od8v IdFw== X-Gm-Message-State: AIVw113KlFXT3H3hG+NIwKxbg44KSEgA3XPQIi5USAy1IBxbN6DG+/bG jixprDBkvMDmWpHw X-Received: by 10.223.150.170 with SMTP id u39mr8911964wrb.184.1499724896422; Mon, 10 Jul 2017 15:14:56 -0700 (PDT) Received: from localhost.localdomain (2a01cb0886107300fcb50df1036df842.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:fcb5:df1:36d:f842]) by smtp.gmail.com with ESMTPSA id d91sm11321852wma.7.2017.07.10.15.14.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 15:14:55 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Tue, 11 Jul 2017 00:14:51 +0200 Message-Id: <3af4ce901c7726b755342c6c72dece9e2842d085.1499724881.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 1/3 v2] fs/squashfs: cleanup if-else cascade X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" And add myself to the DEVELOPPERS for squashfs. Signed-off-by: "Yann E. MORIN" --- DEVELOPERS | 1 + fs/squashfs/squashfs.mk | 12 +++--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1ec405a570..f392838efe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1777,6 +1777,7 @@ N: Wojciech Niziński F: package/fwup/ N: Yann E. MORIN +F: fs/squashfs/ F: package/cegui06/ F: package/celt051/ F: package/dtc/ diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk index 68a57b074a..342c7a8a37 100644 --- a/fs/squashfs/squashfs.mk +++ b/fs/squashfs/squashfs.mk @@ -8,21 +8,15 @@ ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y) ROOTFS_SQUASHFS_ARGS += -comp lz4 -Xhc -else -ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y) +else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y) ROOTFS_SQUASHFS_ARGS += -comp lzo -else -ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZMA),y) +else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZMA),y) ROOTFS_SQUASHFS_ARGS += -comp lzma -else -ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_XZ),y) +else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_XZ),y) ROOTFS_SQUASHFS_ARGS += -comp xz else ROOTFS_SQUASHFS_ARGS += -comp gzip endif -endif -endif -endif define ROOTFS_SQUASHFS_CMD $(HOST_DIR)/bin/mksquashfs $(TARGET_DIR) $@ -noappend \