From nobody Thu Feb 12 22:10:59 2026 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 457FE15A876 for ; Fri, 7 Jun 2024 04:27:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717734449; cv=none; b=L2+cbFwFj/2Hl+jVjGjBFx9H8fp+1r7oU5qW20ZaekFQ7Kss3OfuJA4zo4WHIMxGFrZBxwxxmghR9g/+DYXiY9H1a9Ejt77zqCSS/HXtvHcd3abZbb+4kErdi1UlP8+HX6qqUYvvfDSm4gxwZa7nkJW4EoL3uVDM7SMmL7FOtSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717734449; c=relaxed/simple; bh=XQPyQMojxW5RtOF3L7ouQNOfNKX1oIYNKutrjAC9qr0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jgJ+k+NK5kLjSTfWPDyEzO62pBf0akJLy6BFQmw079baZsEkCt0Nl2pA627X/M3YWBh6puwTPkgqFdM7+IBfSdmOTQRHaFS8i98zdHfax4nDQWs4gUuxk1plOOh2iLocQ1626CsUCIR2xqI3X3ekRGdJPR/xefFSdHly7cl1lSc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4VwSk63LHtzwPFT; Fri, 7 Jun 2024 12:23:26 +0800 (CST) Received: from kwepemm600013.china.huawei.com (unknown [7.193.23.68]) by mail.maildlp.com (Postfix) with ESMTPS id 5EC5D180AA6; Fri, 7 Jun 2024 12:27:25 +0800 (CST) Received: from huawei.com (10.175.104.67) by kwepemm600013.china.huawei.com (7.193.23.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 7 Jun 2024 12:27:06 +0800 From: Zhihao Cheng To: , , , , , CC: , Subject: [RFC PATCH mtd-utils 053/110] ubifs-utils: Move ubifs-media.h in libubifs Date: Fri, 7 Jun 2024 12:25:18 +0800 Message-ID: <20240607042615.2069840-54-chengzhihao1@huawei.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240607042615.2069840-1-chengzhihao1@huawei.com> References: <20240607042615.2069840-1-chengzhihao1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600013.china.huawei.com (7.193.23.68) Content-Type: text/plain; charset="utf-8" Since ubifs-media.h is only used for ubifs-utils, move it under ubifs-utils/libubifs. Signed-off-by: Zhihao Cheng --- ubifs-utils/Makemodule.am | 4 ++-- ubifs-utils/common/ubifs.h | 2 +- {include/mtd =3D> ubifs-utils/libubifs}/ubifs-media.h | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename {include/mtd =3D> ubifs-utils/libubifs}/ubifs-media.h (100%) diff --git a/ubifs-utils/Makemodule.am b/ubifs-utils/Makemodule.am index cb4e1cf1..d297f7a2 100644 --- a/ubifs-utils/Makemodule.am +++ b/ubifs-utils/Makemodule.am @@ -31,7 +31,7 @@ common_SOURCES =3D \ ubifs-utils/common/lpt.c \ ubifs-utils/common/super.c \ ubifs-utils/common/sign.h \ - include/mtd/ubifs-media.h + ubifs-utils/libubifs/ubifs-media.h =20 if WITH_CRYPTO common_SOURCES +=3D ubifs-utils/common/crypto.c \ @@ -47,7 +47,7 @@ mkfs_ubifs_SOURCES =3D \ =20 mkfs_ubifs_LDADD =3D libmtd.a libubi.a $(ZLIB_LIBS) $(LZO_LIBS) $(ZSTD_LIB= S) $(UUID_LIBS) $(LIBSELINUX_LIBS) $(OPENSSL_LIBS) -lm -lpthread mkfs_ubifs_CPPFLAGS =3D $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD= _CFLAGS) $(UUID_CFLAGS) $(LIBSELINUX_CFLAGS) \ - -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/common -rdy= namic + -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/common -I $= (top_srcdir)/ubifs-utils/libubifs -rdynamic =20 EXTRA_DIST +=3D ubifs-utils/common/README =20 diff --git a/ubifs-utils/common/ubifs.h b/ubifs-utils/common/ubifs.h index 5a909f63..ed297cc7 100644 --- a/ubifs-utils/common/ubifs.h +++ b/ubifs-utils/common/ubifs.h @@ -25,7 +25,7 @@ #ifndef __UBIFS_H__ #define __UBIFS_H__ =20 -#include +#include "ubifs-media.h" #include "libubi.h" =20 /* Maximum logical eraseblock size in bytes */ diff --git a/include/mtd/ubifs-media.h b/ubifs-utils/libubifs/ubifs-media.h similarity index 100% rename from include/mtd/ubifs-media.h rename to ubifs-utils/libubifs/ubifs-media.h --=20 2.13.6