diff options
105 files changed, 1974 insertions, 963 deletions
diff --git a/mk/image.mk b/mk/image.mk index 405a2b2d5..35adc3ef6 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -164,9 +164,13 @@ ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk ( \ echo "nod /dev/console 0644 0 0 c 5 1"; \ echo "nod /dev/tty 0644 0 0 c 5 0"; \ - for i in 0 1 2 3 4; do \ - echo "nod /dev/tty$$i 0644 0 0 c 4 $$$$i"; \ - done; \ + echo "nod /dev/tty0 0644 0 0 c 4 0"; \ + echo "nod /dev/tty1 0644 0 0 c 4 1"; \ + echo "nod /dev/tty2 0644 0 0 c 4 2"; \ + echo "nod /dev/tty3 0644 0 0 c 4 3"; \ + echo "nod /dev/tty4 0644 0 0 c 4 4"; \ + echo "nod /dev/tty5 0644 0 0 c 4 5"; \ + echo "nod /dev/tty6 0644 0 0 c 4 6"; \ echo "nod /dev/null 0666 0 0 c 1 3"; \ echo "nod /dev/zero 0666 0 0 c 1 5"; \ echo "nod /dev/kmsg 0644 0 0 c 1 11"; \ diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index c750a9fb0..91707f848 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -15,17 +15,17 @@ KERNEL_FILE_VER:= $(ADK_TARGET_LINUX_KERNEL_GIT) KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif -ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_13),y) -KERNEL_FILE_VER:= 6.13.9 +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_14),y) +KERNEL_FILE_VER:= 6.14.2 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 53e7a3f028b6119ba499245bde0fa10275752817408a4a36b5a34ad74a4727b2 +KERNEL_HASH:= c5c682a354ea3190139357a57d34a79e5c37221ace823a938e10116b577a2e1b endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) -KERNEL_FILE_VER:= 6.12.18 +KERNEL_FILE_VER:= 6.12.23 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= beb902a5f69d9e57710112203db38111dad6d30556ea8ce389284c8077fe944d +KERNEL_HASH:= d8d95404f8deeb7ff6992c0df855025062e9e8182bca6daa27ef2e9275d27749 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) KERNEL_FILE_VER:= 6.6.82 diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 6f9e7ea5a..d4b50ff12 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -69,7 +69,7 @@ else ifneq ($(filter cmake,${CONFIG_STYLE}),) -e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#g" \ $(SCRIPT_DIR)/toolchain.cmake.in > $(SCRIPT_DIR)/toolchain.cmake (cd ${WRKBUILD} && PATH='${HOST_PATH}' \ - cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TOOLCHAIN_FILE="$(SCRIPT_DIR)/toolchain.cmake" \ ${CMAKE_FLAGS} ${WRKSRC}) $(MAKE_TRACE) else ifneq ($(filter minimal,${CONFIG_STYLE}),) @@ -168,7 +168,7 @@ ifneq ($(filter meson,${INSTALL_STYLE}),) else ifneq ($(filter manual,${INSTALL_STYLE}),) env ${MAKE_ENV} ${MAKE} do-install $(MAKE_TRACE) else ifeq ($(strip ${INSTALL_STYLE}),) - cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + cd ${WRKBUILD} && env ${MAKE_ENV} LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ${MAKE} -f ${MAKE_FILE} \ DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} $(MAKE_TRACE) env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE) else 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-Mak |