mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2026-05-04 09:31:26 +02:00
3edd289411
Fixes:
- ubifs-utils: link libmissing.a in case execinfo.h isn't present
- ubifs-utils: common: fix memory leak in devtable.c
- Broken check for GCC compiler versions
- ubifs-utils: missing header file includes
- ubifs-utils: tests: missing files in release tarball
- mtd-tests: flash_speed: really skip destructive tests
- mtd-tests: flash_speed: wrong error message in read_eraseblock()
- serve_image: fix _POSIX_C_SOURCE define
- ubiattach: fix wording in usage example
- fsck.ubifs: don't use pointers that reference out-of-scope variables
- fsck.ubifs: fix platform dependant `ino_t` and `loff_t` formatting
- docfdisk.c: fix potential arithmetic overflows in partition size
- jittertest: reject overlong file names
Changes:
- ubirsvol: resize using all available free space if size is specified
as 0
Upstreamed patches:
- 001-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch[1]
- 002-ubifs-utils-common-fix-memory-leak-in-devtable.c.patch[2]
- 004-Improve-check-for-GCC-compiler-version.patch[3]
- 005-ubifs-utils-ubifs.h-Include-fcntl.h.patch[4]
- 006-ubifs-utils-journal-Include-sys-stat.h.patch[5]
- 007-ubifs-utils-extract_files-Include-linux-limits.h.patch[6]
[1] https://git.infraroot.at/mtd-utils.git/commit/?h=v2.3.1&id=8a83b306db64d6f60186d4396b0b770163b85b6e
[2] https://git.infraroot.at/mtd-utils.git/commit/?h=v2.3.1&id=2669111e3c60b8e146c174db5d2e7e9991f3dd87
[3] https://git.infraroot.at/mtd-utils.git/commit/?h=v2.3.1&id=ac0ab65ebcd7b11739986b81343457469fbb43b0
[4] https://git.infraroot.at/mtd-utils.git/commit/?h=v2.3.1&id=12bc9ad824bd8f18a5ec9c7154ad2374cf8c7ae3
[5] https://git.infraroot.at/mtd-utils.git/commit/?h=v2.3.1&id=173f9714c8da1d685bfa951d43b9310d16bbab3c
[6] https://git.infraroot.at/mtd-utils.git/commit/?h=v2.3.1&id=77981a2888c711268b0e7f32af6af159c2288e23
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/22946
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
96 lines
2.3 KiB
Makefile
96 lines
2.3 KiB
Makefile
#
|
|
# Copyright (C) 2009-2014 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=mtd-utils
|
|
PKG_VERSION:=2.3.1
|
|
PKG_RELEASE:=1
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
|
PKG_SOURCE_URL:=https://infraroot.at/pub/mtd/
|
|
PKG_HASH:=03d9dc58ad10ea3549d9528f6b17a44d8944e18e96c0f31474f9f977078b83dc
|
|
|
|
PKG_INSTALL:=1
|
|
|
|
PKG_FLAGS:=nonshared
|
|
PKG_BUILD_FLAGS:=gc-sections
|
|
|
|
PKG_FIXUP:=autoreconf
|
|
|
|
PKG_BUILD_DEPENDS:=util-linux
|
|
|
|
PKG_LICENSE:=GPLv2
|
|
PKG_LICENSE_FILES:=
|
|
PKG_CPE_ID:=cpe:/a:mtd-utils_project:mtd-utils
|
|
|
|
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
|
|
define Package/mtd-utils/Default
|
|
SECTION:=utils
|
|
CATEGORY:=Utilities
|
|
URL:=http://www.linux-mtd.infradead.org/
|
|
DEPENDS:=@NAND_SUPPORT
|
|
endef
|
|
|
|
define Package/ubi-utils
|
|
$(call Package/mtd-utils/Default)
|
|
TITLE:=Utilities for ubi info/debug
|
|
endef
|
|
|
|
define Package/ubi-utils/description
|
|
Utilities for manipulating memory technology devices.
|
|
endef
|
|
|
|
define Package/nand-utils
|
|
$(call Package/mtd-utils/Default)
|
|
TITLE:=Utilities for nand flash erase/read/write/test
|
|
endef
|
|
|
|
define Package/nand-utils/description
|
|
Utilities for NAND devices.
|
|
endef
|
|
|
|
MAKE_FLAGS += LDLIBS+="$(LIBGCC_S)"
|
|
|
|
CONFIGURE_ARGS += \
|
|
--enable-tests \
|
|
--disable-unit-tests \
|
|
--without-crypto \
|
|
--without-xattr \
|
|
--without-zstd \
|
|
--without-lzo \
|
|
--without-zlib
|
|
|
|
define Package/ubi-utils/conffiles
|
|
/etc/config/ubihealthd
|
|
endef
|
|
|
|
define Package/ubi-utils/install
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
$(INSTALL_BIN) \
|
|
$(PKG_INSTALL_DIR)/usr/sbin/{ubiattach,ubicrc32,ubiblock,ubidetach,ubiformat,ubihealthd} $(1)/usr/sbin/
|
|
$(INSTALL_BIN) \
|
|
$(PKG_INSTALL_DIR)/usr/sbin/{ubimkvol,ubinfo,ubinize,ubirename,ubirmvol,ubirsvol,ubiupdatevol} $(1)/usr/sbin/
|
|
$(INSTALL_DIR) $(1)/etc/init.d
|
|
$(INSTALL_BIN) ./files/ubihealthd.init $(1)/etc/init.d/ubihealthd
|
|
$(INSTALL_DIR) $(1)/etc/uci-defaults
|
|
$(INSTALL_DATA) ./files/ubihealthd.defaults $(1)/etc/uci-defaults/ubihealthd
|
|
endef
|
|
|
|
define Package/nand-utils/install
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
$(INSTALL_BIN) \
|
|
$(PKG_INSTALL_DIR)/usr/sbin/{flash_erase,nanddump,nandwrite,nandtest,mtdinfo} \
|
|
$(PKG_INSTALL_DIR)/usr/lib/mtd-utils/nandbiterrs $(1)/usr/sbin/
|
|
endef
|
|
|
|
$(eval $(call BuildPackage,ubi-utils))
|
|
$(eval $(call BuildPackage,nand-utils))
|