diff options
Diffstat (limited to 'package')
41 files changed, 368 insertions, 642 deletions
diff --git a/package/apex/Makefile b/package/apex/Makefile new file mode 100644 index 000000000..7d2b79ea9 --- /dev/null +++ b/package/apex/Makefile @@ -0,0 +1,46 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= apex +PKG_VERSION:= main +PKG_GIT:= branch +PKG_HASH:= d6c17d16012bc71989c2d608436c1954b27588510d5af69da7f5d5c04ef417aa +PKG_RELEASE:= 1 +PKG_DESCR:= bootloader for ixp4xx devices +PKG_SECTION:= base/boot +PKG_SITES:= https://github.com/linusw/apex.git + +PKG_SYSTEM_DEPENDS:= linksys-nslu2 + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,APEX,apex,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +TARGET_LDFLAGS:= + +do-configure: + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' ARCH=arm $(MAKE) openwrt-nslu2-armeb_config ) + +do-build: + (cd $(WRKBUILD) && env \ + PATH='$(HOST_PATH)' \ + CROSS_COMPILE='$(TARGET_CROSS)' \ + KBUILD_HAVE_NLS=no \ + V=1 \ + ARCH=arm \ + $(MAKE) all) + +apex-install: + $(CP) $(WRKBUILD)/src/arch-arm/rom/apex.bin $(FW_DIR) + +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/apex/patches/patch-src_mach-ixp42x_openwrt-nslu2-armeb_config b/package/apex/patches/patch-src_mach-ixp42x_openwrt-nslu2-armeb_config new file mode 100644 index 000000000..fe182278c --- /dev/null +++ b/package/apex/patches/patch-src_mach-ixp42x_openwrt-nslu2-armeb_config @@ -0,0 +1,13 @@ +--- apex-main.orig/src/mach-ixp42x/openwrt-nslu2-armeb_config 2025-04-07 09:10:43.000000000 +0200 ++++ apex-main/src/mach-ixp42x/openwrt-nslu2-armeb_config 2025-04-08 20:18:52.524389031 +0200 +@@ -19,8 +19,8 @@ CONFIG_EXPERIMENTAL=y + # + # General Setup + # +-CONFIG_TARGET_DESCRIPTION="OpenWrt NSLU2/BE (8MiB Flash)" +-CONFIG_CROSS_COMPILE="armeb-openwrt-linux-" ++CONFIG_TARGET_DESCRIPTION="OpenADK NSLU2/BE (8MiB Flash)" ++CONFIG_CROSS_COMPILE="armeb-openadk-linux-" + CONFIG_AEABI=y + # CONFIG_DRIVER_LONG_LONG_SIZE is not set + CONFIG_CC_OPTIMIZE_FOR_SIZE=y diff --git a/package/base-files/files/rcdev.mdev b/package/base-files/files/rcdev.mdev index b8afd453c..93d678932 100644 --- a/package/base-files/files/rcdev.mdev +++ b/package/base-files/files/rcdev.mdev @@ -1,5 +1,5 @@ # remount /dev with smaller size -mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev +#mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev # start mdev dynamic device node management echo >/dev/mdev.seq @ADK_RUNTIME_DEV_MDEV_LOGGING@ diff --git a/package/cog/Makefile b/package/cog/Makefile new file mode 100644 index 000000000..fead4df57 --- /dev/null +++ b/package/cog/Makefile @@ -0,0 +1,38 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= cog +PKG_VERSION:= 0.18.4 +PKG_RELEASE:= 1 +PKG_HASH:= 31d7079db2eeed790899d2f1f824dd6a54bf30d072d196d737be572f105d99b1 +PKG_DESCR:= minimalistic browser +PKG_SECTION:= app/browser +PKG_DEPENDS:= wpewebkit wpebackend-fdo libinput +PKG_BUILDDEP:= wpewebkit wpebackend-fdo libinput +PKG_URL:= https://wpewebkit.org +PKG_SITES:= https://wpewebkit.org/releases/ + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,COG,cog,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS+= -Ddocumentation=false \ + -Dmanpages=false \ + -Dprograms=true \ + -Dwpe_api=2.0 \ + -Dplatforms=drm + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +cog-install: + $(INSTALL_DIR) $(IDIR_COG)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/cog \ + $(IDIR_COG)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index d204305b0..d036235a1 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= dnsmasq -PKG_VERSION:= 2.90 +PKG_VERSION:= 2.91 PKG_RELEASE:= 1 -PKG_HASH:= 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 +PKG_HASH:= f622682848b33677adb2b6ad08264618a2ae0a01da486a93fd8cd91186b3d153 PKG_DESCR:= lightweight dns, dhcp and tftp server PKG_SECTION:= net/dns PKG_KDEPENDS:= inotify-user diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile index 908bfa3f0..11230e356 100644 --- a/package/evilwm/Makefile +++ b/package/evilwm/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= evilwm -PKG_VERSION:= 1.1.1 +PKG_VERSION:= 1.4.3 PKG_RELEASE:= 1 -PKG_HASH:= 79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a +PKG_HASH:= d5945b20b12c91db2412fac0dbda3fb9c3ec8debb8e1b109838992b2b1bbe5d4 PKG_DESCR:= minimalist window manager PKG_SECTION:= x11/apps PKG_DEPENDS:= libx11 libxext libxrandr diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile index 3c24aa646..4abd6cdb0 100644 --- a/package/evilwm/patches/patch-Makefile +++ b/package/evilwm/patches/patch-Makefile @@ -1,17 +1,6 @@ ---- evilwm-1.1.1.orig/Makefile 2015-07-13 12:19:36.000000000 +0200 -+++ evilwm-1.1.1/Makefile 2016-11-10 02:38:08.961425099 +0100 -@@ -17,6 +17,10 @@ desktopfilesdir = $(datarootdir)/applica - ############################################################################ - # Features - -+XROOT ?= /usr/X11R6 -+OPT_CPPFLAGS += -I$(XROOT)/include -+OPT_LDLIBS += -L$(XROOT)/lib -+ - # Uncomment to enable info banner on holding Ctrl+Alt+I. - OPT_CPPFLAGS += -DINFOBANNER - -@@ -71,10 +75,10 @@ OPT_CPPFLAGS += -DVWM +--- evilwm-1.4.3.orig/Makefile 2024-03-09 11:20:46.000000000 +0100 ++++ evilwm-1.4.3/Makefile 2025-04-12 11:03:24.427876287 +0200 +@@ -83,10 +83,10 @@ OPT_CPPFLAGS += -DNDEBUG # disable asse # Build tools # Change this if you don't use gcc: @@ -24,12 +13,12 @@ WARN = -Wall -W -Wstrict-prototypes -Wpointer-arith -Wcast-align \ -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings \ -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls -@@ -89,7 +93,7 @@ WARN = -Wall -W -Wstrict-prototypes -Wpo +@@ -100,7 +100,7 @@ WARN = -Wall -W -Wstrict-prototypes -Wpo + #EXEEXT = .exe - # Override INSTALL_STRIP if you don't want a stripped binary INSTALL = install --INSTALL_STRIP = -s -+INSTALL_STRIP = +-STRIP = strip ++STRIP ?= strip INSTALL_DIR = $(INSTALL) -d -m 0755 INSTALL_FILE = $(INSTALL) -m 0644 - INSTALL_PROGRAM = $(INSTALL) -m 0755 $(INSTALL_STRIP) + INSTALL_PROGRAM = $(INSTALL) -m 0755 diff --git a/package/evilwm/patches/patch-keymap_h b/package/evilwm/patches/patch-keymap_h deleted file mode 100644 index 9b8fa0f22..000000000 --- a/package/evilwm/patches/patch-keymap_h +++ /dev/null @@ -1,44 +0,0 @@ ---- evilwm-1.1.0.orig/keymap.h 2011-07-03 16:14:21.000000000 +0200 -+++ evilwm-1.1.0/keymap.h 2011-11-29 19:54:57.437509136 +0100 -@@ -2,23 +2,23 @@ - #define _KEYMAP_H - - #define KEY_NEXT XK_Tab --#define KEY_NEW XK_Return --#define KEY_TOPLEFT XK_y --#define KEY_TOPRIGHT XK_u --#define KEY_BOTTOMLEFT XK_b --#define KEY_BOTTOMRIGHT XK_n -+#define KEY_NEW XK_e -+#define KEY_TOPLEFT XK_a -+#define KEY_TOPRIGHT XK_s -+#define KEY_BOTTOMLEFT XK_y -+#define KEY_BOTTOMRIGHT XK_x - #define KEY_LEFT XK_h - #define KEY_RIGHT XK_l - #define KEY_DOWN XK_j --#define KEY_UP XK_k -+#define KEY_UP XK_g - #define KEY_LOWER XK_Insert - #define KEY_ALTLOWER XK_KP_Insert - #define KEY_INFO XK_i - #define KEY_MAXVERT XK_equal --#define KEY_MAX XK_x --#define KEY_DOCK_TOGGLE XK_d -+#define KEY_MAX XK_m -+#define KEY_DOCK_TOGGLE XK_f - #ifdef VWM --# define KEY_FIX XK_f -+# define KEY_FIX XK_d - # define KEY_PREVDESK XK_Left - # define KEY_NEXTDESK XK_Right - # define KEY_TOGGLEDESK XK_a -@@ -26,7 +26,7 @@ - /* Mixtures of Ctrl, Alt an Escape are used for things like VMWare and - * XFree86/Cygwin, so the KILL key is an option in the Makefile */ - #ifndef KEY_KILL --# define KEY_KILL XK_Escape -+# define KEY_KILL XK_k - #endif - - #endif diff --git a/package/expat/Makefile b/package/expat/Makefile index 6b58ee822..b178c115f 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -25,7 +25,8 @@ TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS)) TARGET_LDFLAGS:=$(filter-out -static,$(TARGET_LDFLAGS)) endif -CONFIGURE_ARGS+= --without-docbook +CONFIGURE_ARGS+= --without-docbook \ + --without-tests libexpat-install: ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib diff --git a/package/hush/files/config b/package/hush/files/config index 7e81b468e..a9d58aac4 100644 --- a/package/hush/files/config +++ b/package/hush/files/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.36.1 -# Thu Aug 31 12:09:53 2023 +# Wed Apr 9 19:47:50 2025 # CONFIG_HAVE_DOT_CONFIG=y @@ -107,13 +107,13 @@ CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=255 -CONFIG_FEATURE_EDITING_SAVEHISTORY=y +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set # CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set -CONFIG_FEATURE_REVERSE_SEARCH=y -CONFIG_FEATURE_TAB_COMPLETION=y -CONFIG_FEATURE_USERNAME_COMPLETION=y -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_EDITING_WINCH=y +# CONFIG_FEATURE_REVERSE_SEARCH is not set +# CONFIG_FEATURE_TAB_COMPLETION is not set +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set +# CONFIG_FEATURE_EDITING_WINCH is not set # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set # CONFIG_LOCALE_SUPPORT is not set CONFIG_UNICODE_SUPPORT=y @@ -1130,21 +1130,21 @@ CONFIG_BASH_IS_HUSH=y # CONFIG_CTTYHACK is not set CONFIG_HUSH=y CONFIG_SHELL_HUSH=y -CONFIG_HUSH_BASH_COMPAT=y -CONFIG_HUSH_BRACE_EXPANSION=y -CONFIG_HUSH_BASH_SOURCE_CURDIR=y -CONFIG_HUSH_LINENO_VAR=y +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +# CONFIG_HUSH_LINENO_VAR is not set CONFIG_HUSH_INTERACTIVE=y -CONFIG_HUSH_SAVEHISTORY=y +# CONFIG_HUSH_SAVEHISTORY is not set CONFIG_HUSH_JOB=y -CONFIG_HUSH_TICK=y -CONFIG_HUSH_IF=y -CONFIG_HUSH_LOOPS=y -CONFIG_HUSH_CASE=y -CONFIG_HUSH_FUNCTIONS=y -CONFIG_HUSH_LOCAL=y -CONFIG_HUSH_RANDOM_SUPPORT=y -CONFIG_HUSH_MODE_X=y +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_MODE_X is not set CONFIG_HUSH_ECHO=y CONFIG_HUSH_PRINTF=y CONFIG_HUSH_TEST=y @@ -1169,15 +1169,15 @@ CONFIG_HUSH_GETOPTS=y # # Options common to all shells # -CONFIG_FEATURE_SH_MATH=y -CONFIG_FEATURE_SH_MATH_64=y -CONFIG_FEATURE_SH_MATH_BASE=y +# CONFIG_FEATURE_SH_MATH is not set +# CONFIG_FEATURE_SH_MATH_64 is not set +# CONFIG_FEATURE_SH_MATH_BASE is not set CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set -CONFIG_FEATURE_SH_READ_FRAC=y -CONFIG_FEATURE_SH_HISTFILESIZE=y -CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y +# CONFIG_FEATURE_SH_READ_FRAC is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set +# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set # # System Logging Utilities diff --git a/package/libsoup3/Makefile b/package/libsoup3/Makefile new file mode 100644 index 000000000..caef6b013 --- /dev/null +++ b/package/libsoup3/Makefile @@ -0,0 +1,38 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= libsoup3 +PKG_VERSION:= 3.6.5 +PKG_RELEASE:= 1 +PKG_HASH:= 6891765aac3e949017945c3eaebd8cc8216df772456dc9f460976fbdb7ada234 +PKG_DESCR:= http client/server library +PKG_SECTION:= libs/net +PKG_DEPENDS:= libsqlite glib libpsl nghttp2 +PKG_BUILDDEP:= sqlite glib libpsl nghttp2 +PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libsoup/3.6/ +PKG_OPTS:= dev + +DISTFILES:= libsoup-$(PKG_VERSION).tar.xz +WRKDIST= $(WRKDIR)/libsoup-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSOUP3,libsoup3,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS:= -Dtests=false \ + -Dtls_check=false \ + -Dsysprof=disabled +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +libsoup3-install: + $(INSTALL_DIR) $(IDIR_LIBSOUP)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsoup*.so* \ + $(IDIR_LIBSOUP)/usr/lib + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libwpe/Makefile b/package/libwpe/Makefile new file mode 100644 index 000000000..c8e744ddd --- /dev/null +++ b/package/libwpe/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= libwpe +PKG_VERSION:= 1.16.2 +PKG_RELEASE:= 1 +PKG_HASH:= 960bdd11c3f2cf5bd91569603ed6d2aa42fd4000ed7cac930a804eac367888d7 +PKG_DESCR:= general purpose library for wpe +PKG_SECTION:= libs/misc +PKG_URL:= https://wpewebkit.org +PKG_SITES:= https://wpewebkit.org/releases/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBWPE,libwpe,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5 + +libwpe-install: + $(INSTALL_DIR) $(IDIR_LIBWPE)/usr/lib + $(CP) $(WRKINST)/usr/lib/libwpe*.so* \ + $(IDIR_LIBWPE)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/mtd-utils/Makefile b/package/mtd-utils/Makefile index 1eed5014a..483f30532 100644 --- a/package/mtd-utils/Makefile +++ b/package/mtd-utils/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mtd-utils -PKG_VERSION:= 2.0.0 -PKG_RELEASE:= 2 -PKG_HASH:= 20a377aa86af4c102e930b0d0bb9859e3a10aeb16445f6a1273989b206a717c8 +PKG_VERSION:= 2.2.1 +PKG_RELEASE:= 1 +PKG_HASH:= f7ae20b2eb79ee83441468f0b99d897024cd96ff853eea59106fb1952065c803 PKG_DESCR:= flash filesystem utilities PKG_SECTION:= sys/fs PKG_DEPENDS:= libuuid liblzo diff --git a/package/mtd-utils/patches/patch-Makefile_in b/package/mtd-utils/patches/patch-Makefile_in deleted file mode 100644 index ddcbcf9e3..000000000 --- a/package/mtd-utils/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- mtd-utils-2.0.0.orig/Makefile.in 2016-12-22 11:21:54.000000000 +0100 -+++ mtd-utils-2.0.0/Makefile.in 2017-04-26 09:13:34.000000000 +0200 -@@ -232,7 +232,7 @@ am__EXEEXT_11 = ftl_format$(EXEEXT) doc_ - flash_lock$(EXEEXT) flash_unlock$(EXEEXT) \ - flash_otp_info$(EXEEXT) flash_otp_dump$(EXEEXT) \ - flash_otp_lock$(EXEEXT) flash_otp_write$(EXEEXT) \ -- flashcp$(EXEEXT) mtdpart$(EXEEXT) -+ flashcp$(EXEEXT) - am__EXEEXT_12 = nanddump$(EXEEXT) nandwrite$(EXEEXT) nandtest$(EXEEXT) \ - nftldump$(EXEEXT) nftl_format$(EXEEXT) - am__EXEEXT_13 = rfddump$(EXEEXT) rfdformat$(EXEEXT) diff --git a/package/mtd-utils/patches/patch-include_common_h b/package/mtd-utils/patches/patch-include_common_h deleted file mode 100644 index 1109ab485..000000000 --- a/package/mtd-utils/patches/patch-include_common_h +++ /dev/null @@ -1,19 +0,0 @@ ---- mtd-utils-2.0.0.orig/include/common.h 2016-12-14 10:06:35.000000000 +0100 -+++ mtd-utils-2.0.0/include/common.h 2017-04-26 01:52:28.000000000 +0200 -@@ -26,10 +26,15 @@ - #include <string.h> - #include <fcntl.h> - #include <errno.h> -+#ifndef __APPLE__ - #include <features.h> -+#include <sys/sysmacros.h> -+#endif - #include <inttypes.h> - #include <unistd.h> --#include <sys/sysmacros.h> -+ -+#include <time.h> -+#include "os-compat.h" - - #include "config.h" - diff --git a/package/mtd-utils/patches/patch-include_mtd_ubi-media_h b/package/mtd-utils/patches/patch-include_mtd_ubi-media_h deleted file mode 100644 index c53899bfd..000000000 --- a/package/mtd-utils/patches/patch-include_mtd_ubi-media_h +++ /dev/null @@ -1,11 +0,0 @@ ---- mtd-utils-2.0.0.orig/include/mtd/ubi-media.h 2016-07-12 14:16:45.000000000 +0200 -+++ mtd-utils-2.0.0/include/mtd/ubi-media.h 2017-04-25 21:14:34.000000000 +0200 -@@ -30,7 +30,7 @@ - #ifndef __UBI_MEDIA_H__ - #define __UBI_MEDIA_H__ - --#include <asm/byteorder.h> -+#include <linux/types.h> - - /* The version of UBI images supported by this implementation */ - #define UBI_VERSION 1 diff --git a/package/mtd-utils/patches/patch-include_mtd_ubifs-media_h b/package/mtd-utils/patches/patch-include_mtd_ubifs-media_h deleted file mode 100644 index 471454799..000000000 --- a/package/mtd-utils/patches/patch-include_mtd_ubifs-media_h +++ /dev/null @@ -1,11 +0,0 @@ ---- mtd-utils-2.0.0.orig/include/mtd/ubifs-media.h 2016-07-12 14:16:45.000000000 +0200 -+++ mtd-utils-2.0.0/include/mtd/ubifs-media.h 2017-04-25 21:47:14.000000000 +0200 -@@ -33,7 +33,7 @@ - #ifndef __UBIFS_MEDIA_H__ - #define __UBIFS_MEDIA_H__ - --#include <asm/byteorder.h> -+#include <linux/types.h> - - /* UBIFS node magic number (must not have the padding byte first or last) */ - #define UBIFS_NODE_MAGIC 0x06101831 diff --git a/package/mtd-utils/patches/patch-jffsX-utils_rbtree_h b/package/mtd-utils/patches/patch-jffsX-utils_rbtree_h deleted file mode 100644 index 7df21dc96..000000000 --- a/package/mtd-utils/patches/patch-jffsX-utils_rbtree_h +++ /dev/null @@ -1,11 +0,0 @@ ---- mtd-utils-2.0.0.orig/jffsX-utils/rbtree.h 2016-07-12 14:16:45.000000000 +0200 -+++ mtd-utils-2.0.0/jffsX-utils/rbtree.h 2017-04-26 02:27:35.000000000 +0200 -@@ -94,7 +94,7 @@ static inline struct page * rb_insert_pa - #ifndef _LINUX_RBTREE_H - #define _LINUX_RBTREE_H - --#include <linux/kernel.h> -+#include <endian.h> - #include <linux/stddef.h> - - struct rb_node diff --git a/package/mtd-utils/patches/patch-misc-utils_docfdisk_c b/package/mtd-utils/patches/patch-misc-utils_docfdisk_c deleted file mode 100644 index f3378c525..000000000 --- a/package/mtd-utils/patches/patch-misc-utils_docfdisk_c +++ /dev/null @@ -1,10 +0,0 @@ ---- mtd-utils-2.0.0.orig/misc-utils/docfdisk.c 2016-12-14 10:06:35.000000000 +0100 -+++ mtd-utils-2.0.0/misc-utils/docfdisk.c 2017-04-26 08:56:40.000000000 +0200 -@@ -19,6 +19,7 @@ - #define PROGRAM_NAME "docfdisk" - - #define _XOPEN_SOURCE 500 /* for pread/pwrite */ -+#include <sys/types.h> - #include <unistd.h> - #include <stdlib.h> - #include <stdio.h> diff --git a/package/mtd-utils/patches/patch-misc-utils_recv_image_c b/package/mtd-utils/patches/patch-misc-utils_recv_image_c deleted file mode 100644 index ab07ab59a..000000000 --- a/package/mtd-utils/patches/patch-misc-utils_recv_image_c +++ /dev/null @@ -1,13 +0,0 @@ ---- mtd-utils-2.0.0.orig/misc-utils/recv_image.c 2016-07-12 14:16:45.000000000 +0200 -+++ mtd-utils-2.0.0/misc-utils/recv_image.c 2017-04-26 09:06:48.000000000 +0200 -@@ -4,6 +4,10 @@ - #define _BSD_SOURCE /* struct ip_mreq */ - #define _DEFAULT_SOURCE - -+#ifndef IPV6_ADD_MEMBERSHIP -+#define IPV6_ADD_MEMBERSHIP 20 -+#endif -+ - #include <errno.h> - #include <stdio.h> - #include <netdb.h> diff --git a/package/mtd-utils/patches/patch-nand-utils_nftl_format_c b/package/mtd-utils/patches/patch-nand-utils_nftl_format_c deleted file mode 100644 index ff25489ef..000000000 --- a/package/mtd-utils/patches/patch-nand-utils_nftl_format_c +++ /dev/null @@ -1,10 +0,0 @@ ---- mtd-utils-2.0.0.orig/nand-utils/nftl_format.c 2016-12-14 10:06:35.000000000 +0100 -+++ mtd-utils-2.0.0/nand-utils/nftl_format.c 2017-04-26 08:57:07.000000000 +0200 -@@ -23,6 +23,7 @@ - #define PROGRAM_NAME "nftl_format" - - #define _XOPEN_SOURCE 500 /* for pread/pwrite */ -+#include <sys/types.h> - #include <unistd.h> - #include <stdlib.h> - #include <stdio.h> diff --git a/package/mtd-utils/patches/patch-ubifs-utils_mkfs_ubifs_defs_h b/package/mtd-utils/patches/patch-ubifs-utils_mkfs_ubifs_defs_h deleted file mode 100644 index e3f61b1e7..000000000 --- a/package/mtd-utils/patches/patch-ubifs-utils_mkfs_ubifs_defs_h +++ /dev/null @@ -1,18 +0,0 @@ ---- mtd-utils-2.0.0.orig/ubifs-utils/mkfs.ubifs/defs.h 2016-07-12 14:16:45.000000000 +0200 -+++ mtd-utils-2.0.0/ubifs-utils/mkfs.ubifs/defs.h 2017-04-26 01:55:07.000000000 +0200 -@@ -39,6 +39,7 @@ struct qstr - size_t len; - }; - -+#ifndef __APPLE__ - /** - * fls - find last (most-significant) bit set - * @x: the word to search -@@ -74,6 +75,7 @@ static inline int fls(int x) - } - return r; - } -+#endif - - #define do_div(n,base) ({ \ - int __res; \ diff --git a/package/mtd-utils/src/include/asm/types.h b/package/mtd-utils/src/include/asm/types.h deleted file mode 100644 index 5726d9ef9..000000000 --- a/package/mtd-utils/src/include/asm/types.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) Bernhard Walle <bernhard@bwalle.de>, 2012 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - * the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Comatibility with BSD-like userland. - */ -#ifndef ASM_TYPES_H_ -#define ASM_TYPES_H_ - -#ifdef __linux__ -#include_next <asm/types.h> -#endif - -#endif /* ASM_TYPES_H_ */ - diff --git a/package/mtd-utils/src/include/byteswap.h b/package/mtd-utils/src/include/byteswap.h deleted file mode 100644 index 6f9839f7a..000000000 --- a/package/mtd-utils/src/include/byteswap.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) Bernhard Walle <bernhard@bwalle.de>, 2012 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - * the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Comatibility with BSD-like userland. - */ -#ifndef BYTESWAP_H_ -#define BYTESWAP_H_ - -#ifdef __linux__ -#include_next <byteswap.h> -#else - -#include <stdint.h> - -static inline uint16_t bswap_16(uint16_t value) -{ - return ((value & 0xff00) >> 8) | ((value & 0xff) << 8); -} - -static inline uint32_t bswap_32(uint32_t value) -{ - return ((value & 0xff000000) >> 24) | - ((value & 0x00ff0000) >> 8) | - ((value & 0x0000ff00) << 8) | - ((value & 0x000000ff) << 24); -} - -static inline uint64_t bswap_64(uint64_t value) -{ - return ((value & 0xff00000000000000ull) >> 56) | - ((value & 0x00ff000000000000ull) >> 40) | - ((value & 0x0000ff0000000000ull) >> 24) | - ((value & 0x000000ff00000000ull) >> 8) | - ((value & 0x00000000ff000000ull) << 8) | - ((value & 0x0000000000ff0000ull) << 24) | - ((value & 0x000000000000ff00ull) << 40) | - ((value & 0x00000000000000ffull) << 56); -} - -#endif - -#endif /* BYTESWAP_H_ */ |