* Distribution updates - kernel 6.1.10, Python, systemd, busybox, SDL2, etc.
* Update emulators, cores, and art book next theme. * Drop -Ofast, --disable-shared --enable-static as defaults. * Misc build fixes.
This commit is contained in:
parent
1dcae05ad9
commit
a837478baf
52 changed files with 166 additions and 270 deletions
6
Makefile
6
Makefile
|
@ -28,11 +28,11 @@ world: x86_64
|
|||
x86_64: handheld RK3588
|
||||
|
||||
handheld:
|
||||
DEVICE_ROOT=handheld PROJECT=PC DEVICE=handheld ARCH=x86_64 ./scripts/build_distro
|
||||
PROJECT=PC DEVICE=handheld ARCH=x86_64 ./scripts/build_distro
|
||||
|
||||
RK3588:
|
||||
DEVICE_ROOT=RK3588 PROJECT=Rockchip DEVICE=RK3588 ARCH=arm ./scripts/build_distro
|
||||
DEVICE_ROOT=RK3588 PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 ./scripts/build_distro
|
||||
PROJECT=Rockchip DEVICE=RK3588 ARCH=arm ./scripts/build_distro
|
||||
PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 ./scripts/build_distro
|
||||
|
||||
update:
|
||||
PROJECT=PC DEVICE=handheld ARCH=x86_64 ./scripts/update_packages
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
GCC_OPTIM="-Ofast"
|
||||
GCC_OPTIM="-O3"
|
||||
# Linker hash-style is set to gnu via gcc default
|
||||
LD_OPTIM="-Wl,--as-needed"
|
||||
|
||||
|
|
|
@ -3,8 +3,7 @@
|
|||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="sbc"
|
||||
PKG_VERSION="1.5"
|
||||
PKG_SHA256="51d4e385237e9d4780c7b20e660e30fb6a7a6d75ca069f1ed630fa6105232aba"
|
||||
PKG_VERSION="2.0"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.bluez.org/"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/bluetooth/sbc-${PKG_VERSION}.tar.gz"
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
From: Marius Bakke <marius@xxxxxxx>
|
||||
|
||||
Don't call __builtin_cpu_init unless targeting i386 or x86_64.
|
||||
Otherwise we get an error at link time:
|
||||
|
||||
CC sbc/sbc_primitives.lo
|
||||
sbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’:
|
||||
sbc/sbc_primitives.c:596:2: warning: implicit declaration of function ‘__builtin_cpu_init’; did you mean ‘__builtin_irint’? [-Wimplicit-function-declaration]
|
||||
[...]
|
||||
CCLD src/sbcdec
|
||||
ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives':
|
||||
sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init'
|
||||
---
|
||||
sbc/sbc_primitives.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c
|
||||
index 97a75be..09c214a 100644
|
||||
--- a/sbc/sbc_primitives.c
|
||||
+++ b/sbc/sbc_primitives.c
|
||||
@@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j(
|
||||
|
||||
static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
|
||||
{
|
||||
+#if defined(__x86_64__) || defined(__i386__)
|
||||
__builtin_cpu_init();
|
||||
|
||||
#ifdef SBC_BUILD_WITH_MMX_SUPPORT
|
||||
@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
|
||||
if (__builtin_cpu_supports("sse4.2"))
|
||||
sbc_init_primitives_sse(state);
|
||||
#endif
|
||||
+#endif
|
||||
}
|
||||
|
||||
/*
|
||||
--
|
||||
2.29.2
|
||||
|
|
@ -20,7 +20,7 @@ case ${DEVICE} in
|
|||
PKG_URL="${PKG_SITE}.git"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="8e38ac078522bdf07e4558f22af855aed20e249a"
|
||||
PKG_VERSION="86a5a82050d5577aac45210dde6616866b857d38"
|
||||
PKG_SITE="https://github.com/hrydgard/ppsspp"
|
||||
PKG_URL="${PKG_SITE}.git"
|
||||
;;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# Copyright (C) 2022-present Fewtarius
|
||||
|
||||
PKG_NAME="flycastsa"
|
||||
PKG_VERSION="5875eda4d0f34fd334de2c00ff42efc7913e3bc2"
|
||||
PKG_VERSION="a045c52146f688f76ff2d21bcb9f6560f9825a82"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/flyinghead/flycast"
|
||||
PKG_URL="${PKG_SITE}.git"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# Copyright (C) 2018-present 5schatten (https://github.com/5schatten)
|
||||
|
||||
PKG_NAME="hatarisa"
|
||||
PKG_VERSION="9f58fa6a45f07cfc007896ecb4ddb3279451e90a"
|
||||
PKG_VERSION="78d7b27b58a3354578dba27614476678a5f895de"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/hatari/hatari"
|
||||
PKG_URL="https://github.com/hatari/hatari/archive/${PKG_VERSION}.tar.gz"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2022-present Fewtarius
|
||||
|
||||
PKG_NAME="hypseus-singe"
|
||||
PKG_VERSION="b7af7615723de86b95a9943e9a7cf444cd250146"
|
||||
PKG_VERSION="6650eea978032af6850961053fe4e64bb9be5b41"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL3"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC)
|
||||
|
||||
PKG_NAME="retroarch"
|
||||
PKG_VERSION="c27e73e736467a29c85e8b73212238a4b52388d0"
|
||||
PKG_VERSION="3a540f687c4abacfd6713c350ac2c13ae7ac8bdf"
|
||||
PKG_SITE="https://github.com/libretro/RetroArch"
|
||||
PKG_URL="${PKG_SITE}.git"
|
||||
PKG_LICENSE="GPLv3"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2020-present Fewtarius
|
||||
|
||||
PKG_NAME="scummvmsa"
|
||||
PKG_VERSION="91c01df4b800034b7aafc8bef4dfca4929bd5667"
|
||||
PKG_VERSION="ab666139e2904a57c1db30d8f020137acbd1a5a7"
|
||||
PKG_REV="1"
|
||||
PKG_LICENSE="GPL2"
|
||||
PKG_SITE="https://github.com/scummvm/scummvm"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
################################################################################
|
||||
|
||||
PKG_NAME="TIC-80"
|
||||
PKG_VERSION="ca3bb11f7d91b6f61c30b27e95958521e3432576"
|
||||
PKG_VERSION="7be33dc4b5bc54e417639333fbd1c67582aeff21"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv3"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC)
|
||||
|
||||
PKG_NAME="fbneo"
|
||||
PKG_VERSION="45d0b3636c3c511f99e1c082817971d0d385873b"
|
||||
PKG_VERSION="868dee240104ed2ba3b74ec0bc3c9f467fb284f8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Non-commercial"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2022-present Fewtarius
|
||||
|
||||
PKG_NAME="flycast"
|
||||
PKG_VERSION="5875eda4d0f34fd334de2c00ff42efc7913e3bc2"
|
||||
PKG_VERSION="a045c52146f688f76ff2d21bcb9f6560f9825a82"
|
||||
PKG_SITE="https://github.com/flyinghead/flycast"
|
||||
PKG_URL="${PKG_SITE}.git"
|
||||
PKG_DEPENDS_TARGET="toolchain libzip"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
################################################################################
|
||||
|
||||
PKG_NAME="gambatte"
|
||||
PKG_VERSION="ca0f7e14c55698a8eb81ea5af58701173e85bc7f"
|
||||
PKG_VERSION="4c64b5285b88a08b8134f6c36177fdca56d46192"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
################################################################################
|
||||
|
||||
PKG_NAME="mame2003-plus"
|
||||
PKG_VERSION="92d1f6e814fc794224014e79d87fb11a5fb5224f"
|
||||
PKG_VERSION="9f2dffe5ff58200da8659c9c92d5b4a8980d7b94"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MAME"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
################################################################################
|
||||
|
||||
PKG_NAME="nestopia"
|
||||
PKG_VERSION="cb1e24e2d6e5d49a85924a9d6dd9c470c109f537"
|
||||
PKG_VERSION="125e2ab6d7f2dd4accc60cb84154adad21d3a6a9"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
################################################################################
|
||||
|
||||
PKG_NAME="ppsspp"
|
||||
PKG_VERSION="8e38ac078522bdf07e4558f22af855aed20e249a"
|
||||
PKG_VERSION="86a5a82050d5577aac45210dde6616866b857d38"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/hrydgard/ppsspp"
|
||||
PKG_URL="https://github.com/hrydgard/ppsspp.git"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
################################################################################
|
||||
|
||||
PKG_NAME="puae"
|
||||
PKG_VERSION="13aa6e65019c37c20b282c0f8fba5be0c8627462"
|
||||
PKG_VERSION="b2c4acb0ae12a507647f8f181962f96ad740f2e8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
################################################################################
|
||||
|
||||
PKG_NAME="scummvm"
|
||||
PKG_VERSION="aec1775518acef20a9248477381b9962f6a09ed8"
|
||||
PKG_VERSION="18add58f142f0b0fe1614f79a9a9cb48aa3eb033"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
################################################################################
|
||||
|
||||
PKG_NAME="slang-shaders"
|
||||
PKG_VERSION="1fc940e94244b138500404f404b5f8aa5c061ad5"
|
||||
PKG_VERSION="356678ec53ca940a53fa509eff0b65bb63a403bb"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC)
|
||||
|
||||
PKG_NAME="swanstation"
|
||||
PKG_VERSION="826d58355ce47e2709c6385e66d8833b3125c8e8"
|
||||
PKG_VERSION="04f1ec57e8905ce7bb0c677a2fbc3d5f59becef6"
|
||||
PKG_ARCH=""
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_SITE="https://github.com/libretro/swanstation"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2022-present Fewtarius
|
||||
|
||||
PKG_NAME="SDL2"
|
||||
PKG_VERSION="2.26.2"
|
||||
PKG_VERSION="2.26.3"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.libsdl.org/"
|
||||
PKG_URL="https://www.libsdl.org/release/SDL2-${PKG_VERSION}.tar.gz"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
PKG_NAME="linux"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_VERSION="6.1.9"
|
||||
PKG_VERSION="6.1.10"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_SITE="http://www.kernel.org"
|
||||
PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
|
||||
|
|
|
@ -3,8 +3,7 @@
|
|||
|
||||
PKG_NAME="Python3"
|
||||
# When changing PKG_VERSION remember to sync PKG_PYTHON_VERSION!
|
||||
PKG_VERSION="3.11.0"
|
||||
PKG_SHA256="a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3"
|
||||
PKG_VERSION="3.11.1"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="https://www.python.org/"
|
||||
PKG_URL="https://www.python.org/ftp/python/${PKG_VERSION}/${PKG_NAME::-1}-${PKG_VERSION}.tar.xz"
|
||||
|
|
|
@ -1,62 +0,0 @@
|
|||
From 27763ef6ac5ad9d70dba68bf9c2c910ef1ddcded Mon Sep 17 00:00:00 2001
|
||||
From: Brandt Bucher <brandtbucher@microsoft.com>
|
||||
Date: Wed, 9 Nov 2022 13:55:20 -0800
|
||||
Subject: [PATCH] GH-99205: Mark new interpreters and threads as non-static
|
||||
(GH-99268) (cherry picked from commit
|
||||
283ab0e1c002f2d7459d581df6b4b8599e7d1a4d)
|
||||
|
||||
Co-authored-by: Brandt Bucher <brandtbucher@microsoft.com>
|
||||
---
|
||||
.../2022-11-08-16-35-25.gh-issue-99205.2YOoFT.rst | 2 ++
|
||||
Python/pystate.c | 8 ++++++++
|
||||
2 files changed, 10 insertions(+)
|
||||
create mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-11-08-16-35-25.gh-issue-99205.2YOoFT.rst
|
||||
|
||||
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-11-08-16-35-25.gh-issue-99205.2YOoFT.rst b/Misc/NEWS.d/next/Core and Builtins/2022-11-08-16-35-25.gh-issue-99205.2YOoFT.rst
|
||||
new file mode 100644
|
||||
index 000000000000..8ad0e147c203
|
||||
--- /dev/null
|
||||
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-11-08-16-35-25.gh-issue-99205.2YOoFT.rst
|
||||
@@ -0,0 +1,2 @@
|
||||
+Fix an issue that prevented :c:type:`PyThreadState` and
|
||||
+:c:type:`PyInterpreterState` memory from being freed properly.
|
||||
diff --git a/Python/pystate.c b/Python/pystate.c
|
||||
index 425065322ebd..c0d161f894c9 100644
|
||||
--- a/Python/pystate.c
|
||||
+++ b/Python/pystate.c
|
||||
@@ -341,6 +341,7 @@ PyInterpreterState_New(void)
|
||||
interp = &runtime->_main_interpreter;
|
||||
assert(interp->id == 0);
|
||||
assert(interp->next == NULL);
|
||||
+ assert(interp->_static);
|
||||
|
||||
interpreters->main = interp;
|
||||
}
|
||||
@@ -355,6 +356,9 @@ PyInterpreterState_New(void)
|
||||
// Set to _PyInterpreterState_INIT.
|
||||
memcpy(interp, &initial._main_interpreter,
|
||||
sizeof(*interp));
|
||||
+ // We need to adjust any fields that are different from the initial
|
||||
+ // interpreter (as defined in _PyInterpreterState_INIT):
|
||||
+ interp->_static = false;
|
||||
|
||||
if (id < 0) {
|
||||
/* overflow or Py_Initialize() not called yet! */
|
||||
@@ -817,6 +821,7 @@ new_threadstate(PyInterpreterState *interp)
|
||||
assert(id == 1);
|
||||
used_newtstate = 0;
|
||||
tstate = &interp->_initial_thread;
|
||||
+ assert(tstate->_static);
|
||||
}
|
||||
else {
|
||||
// Every valid interpreter must have at least one thread.
|
||||
@@ -828,6 +833,9 @@ new_threadstate(PyInterpreterState *interp)
|
||||
memcpy(tstate,
|
||||
&initial._main_interpreter._initial_thread,
|
||||
sizeof(*tstate));
|
||||
+ // We need to adjust any fields that are different from the initial
|
||||
+ // thread (as defined in _PyThreadState_INIT):
|
||||
+ tstate->_static = false;
|
||||
}
|
||||
interp->threads.head = tstate;
|
||||
|
|
@ -3,8 +3,7 @@
|
|||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="ethtool"
|
||||
PKG_VERSION="5.1"
|
||||
PKG_SHA256="65feac1fec6565290b7784b2efc925dee900a9b11202ce7c6c30a967c3da3387"
|
||||
PKG_VERSION="6.1"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/"
|
||||
PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
|
|
|
@ -2,8 +2,7 @@
|
|||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="rfkill"
|
||||
PKG_VERSION="0.5"
|
||||
PKG_SHA256="e0ae3004215e39a6c5c36e0726558740728d16f67ebdb8bea621250f6091d86a"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://wireless.wiki.kernel.org/en/users/documentation/rfkill"
|
||||
PKG_URL="https://www.kernel.org/pub/software/network/rfkill/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
|
|
|
@ -24,6 +24,8 @@ pre_configure_target() {
|
|||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
python_remove_source
|
||||
|
||||
rm -rf ${INSTALL}/usr/bin
|
||||
rm -rf ${INSTALL}/usr/share/pygobject
|
||||
}
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="waf"
|
||||
PKG_VERSION="2.0.24"
|
||||
PKG_SHA256="6b78a3594540b232a154f64c4eb7e21f28e4e073c7e1605e4b9977519a6cb89e"
|
||||
PKG_VERSION="2.0.25"
|
||||
PKG_SHA256="66cff7beed0e77db874e9232cc08874abb3e866c7f0f1f34ba2f959fde44fdd4"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="https://waf.io"
|
||||
PKG_URL="https://waf.io/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="pycryptodome"
|
||||
PKG_VERSION="3.15.0"
|
||||
PKG_SHA256="10356f1e0a76d87688482d497a490e10759d1c7e915731d1932c95030bd48241"
|
||||
PKG_VERSION="3.16.0"
|
||||
PKG_SHA256="c8f6878f11e6164b663058246d2c3ecc3c445f9cbff03dea97cee80c4223b9ff"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="https://pypi.org/project/pycryptodome"
|
||||
PKG_URL="https://github.com/Legrandin/${PKG_NAME}/archive/v${PKG_VERSION}.tar.gz"
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="dbussy"
|
||||
PKG_VERSION="71616a370d3f59ef1681d26f5df77c1545d5bc04" # 2022-09-03
|
||||
PKG_SHA256="8ddae13387315c00bc316db1a2db8044073ad0d47f18d9840b3ba7f148b525ff"
|
||||
PKG_VERSION="691a8a8a1914416b7ea1545fb931d74f2e381f09"
|
||||
PKG_SHA256="857104ef2fd1978323d7c87b32c753d2d178b79adbd13f52cea23511f5195ded"
|
||||
PKG_LICENSE="LGPLv2.1+"
|
||||
PKG_SITE="https://gitlab.com/ldo/dbussy"
|
||||
PKG_URL="https://github.com/ldo/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="simplejson"
|
||||
PKG_VERSION="3.18.0"
|
||||
PKG_SHA256="58a429d2c2fa80834115b923ff689622de8f214cf0dc4afa9f59e824b444ab31"
|
||||
PKG_VERSION="3.18.1"
|
||||
PKG_SHA256="746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://pypi.org/project/simplejson"
|
||||
PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
|
|
|
@ -17,4 +17,8 @@ then
|
|||
BRIGHTNESS=3
|
||||
fi
|
||||
|
||||
printf "%.0f" $(echo "${BRIGHTNESS}") > /sys/class/backlight/$(brightness device)/brightness
|
||||
BRIGHTNESS_DEVICE="$(brightness device)"
|
||||
if [ -e "/sys/class/backlight/${BRIGHTNESS_DEVICE}/brightness" ]
|
||||
then
|
||||
printf "%.0f" $(echo "${BRIGHTNESS}") > /sys/class/backlight/${BRIGHTNESS_DEVICE}/brightness
|
||||
fi
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.35.0
|
||||
# Tue Sep 13 18:30:16 2022
|
||||
# Busybox version: 1.36.0
|
||||
# Tue Feb 7 18:27:37 2023
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
|
@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
|
|||
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
|
||||
CONFIG_PASSWORD_MINLEN=6
|
||||
CONFIG_MD5_SMALL=1
|
||||
CONFIG_SHA1_SMALL=3
|
||||
CONFIG_SHA1_HWACCEL=y
|
||||
CONFIG_SHA256_HWACCEL=y
|
||||
CONFIG_SHA3_SMALL=0
|
||||
# CONFIG_FEATURE_NON_POSIX_CP is not set
|
||||
CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
|
||||
|
@ -123,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
|
|||
# CONFIG_UNICODE_BIDI_SUPPORT is not set
|
||||
# CONFIG_UNICODE_NEUTRAL_TABLE is not set
|
||||
# CONFIG_UNICODE_PRESERVE_BROKEN is not set
|
||||
# CONFIG_LOOP_CONFIGURE is not set
|
||||
# CONFIG_NO_LOOP_CONFIGURE is not set
|
||||
CONFIG_TRY_LOOP_CONFIGURE=y
|
||||
|
||||
#
|
||||
# Applets
|
||||
|
@ -326,6 +332,7 @@ CONFIG_CRC32=y
|
|||
# CONFIG_FEATURE_TR_EQUIV is not set
|
||||
# CONFIG_TRUE is not set
|
||||
# CONFIG_TRUNCATE is not set
|
||||
CONFIG_TSORT=y
|
||||
# CONFIG_TTY is not set
|
||||
# CONFIG_UNAME is not set
|
||||
CONFIG_UNAME_OSNAME=""
|
||||
|
@ -807,10 +814,12 @@ CONFIG_FEATURE_LESS_MAXLINES=0
|
|||
# CONFIG_RFKILL is not set
|
||||
# CONFIG_RUNLEVEL is not set
|
||||
# CONFIG_RX is not set
|
||||
CONFIG_SEEDRNG=y
|
||||
# CONFIG_SETFATTR is not set
|
||||
# CONFIG_SETSERIAL is not set
|
||||
# CONFIG_STRINGS is not set
|
||||
# CONFIG_TIME is not set
|
||||
CONFIG_TREE=y
|
||||
# CONFIG_TS is not set
|
||||
# CONFIG_TTYSIZE is not set
|
||||
# CONFIG_UBIATTACH is not set
|
||||
|
@ -983,6 +992,7 @@ CONFIG_DHCPD_LEASES_FILE=""
|
|||
# CONFIG_FEATURE_UDHCPC_ARPING is not set
|
||||
# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
|
||||
CONFIG_UDHCPC_DEFAULT_SCRIPT=""
|
||||
CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
|
||||
# CONFIG_UDHCPC6 is not set
|
||||
# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
|
||||
# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
|
||||
|
@ -1113,6 +1123,7 @@ CONFIG_BASH_IS_NONE=y
|
|||
# CONFIG_ASH_ECHO is not set
|
||||
# CONFIG_ASH_PRINTF is not set
|
||||
# CONFIG_ASH_TEST is not set
|
||||
# CONFIG_ASH_SLEEP is not set
|
||||
# CONFIG_ASH_HELP is not set
|
||||
# CONFIG_ASH_GETOPTS is not set
|
||||
# CONFIG_ASH_CMDCMD is not set
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.35.0
|
||||
# Tue Sep 13 17:55:56 2022
|
||||
# Busybox version: 1.36.0
|
||||
# Tue Feb 7 18:24:37 2023
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
|
@ -9,7 +9,6 @@ CONFIG_HAVE_DOT_CONFIG=y
|
|||
# Settings
|
||||
#
|
||||
# CONFIG_DESKTOP is not set
|
||||
CONFIG_PLATFORM_LINUX=y
|
||||
# CONFIG_EXTRA_COMPAT is not set
|
||||
# CONFIG_FEDORA_COMPAT is not set
|
||||
# CONFIG_INCLUDE_SUSv2 is not set
|
||||
|
@ -94,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
|
|||
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
|
||||
CONFIG_PASSWORD_MINLEN=6
|
||||
CONFIG_MD5_SMALL=0
|
||||
CONFIG_SHA1_SMALL=3
|
||||
CONFIG_SHA1_HWACCEL=y
|
||||
CONFIG_SHA256_HWACCEL=y
|
||||
CONFIG_SHA3_SMALL=0
|
||||
# CONFIG_FEATURE_NON_POSIX_CP is not set
|
||||
CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
|
||||
|
@ -124,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
|
|||
# CONFIG_UNICODE_BIDI_SUPPORT is not set
|
||||
# CONFIG_UNICODE_NEUTRAL_TABLE is not set
|
||||
# CONFIG_UNICODE_PRESERVE_BROKEN is not set
|
||||
# CONFIG_LOOP_CONFIGURE is not set
|
||||
# CONFIG_NO_LOOP_CONFIGURE is not set
|
||||
CONFIG_TRY_LOOP_CONFIGURE=y
|
||||
|
||||
#
|
||||
# Applets
|
||||
|
@ -339,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y
|
|||
CONFIG_FEATURE_TR_EQUIV=y
|
||||
# CONFIG_TRUE is not set
|
||||
# CONFIG_TRUNCATE is not set
|
||||
CONFIG_TSORT=y
|
||||
CONFIG_TTY=y
|
||||
CONFIG_UNAME=y
|
||||
CONFIG_UNAME_OSNAME="GNU/Linux"
|
||||
|
@ -832,10 +838,12 @@ CONFIG_NANDWRITE=y
|
|||
# CONFIG_RFKILL is not set
|
||||
# CONFIG_RUNLEVEL is not set
|
||||
# CONFIG_RX is not set
|
||||
CONFIG_SEEDRNG=y
|
||||
# CONFIG_SETFATTR is not set
|
||||
# CONFIG_SETSERIAL is not set
|
||||
# CONFIG_STRINGS is not set
|
||||
# CONFIG_TIME is not set
|
||||
CONFIG_TREE=y
|
||||
# CONFIG_TS is not set
|
||||
# CONFIG_TTYSIZE is not set
|
||||
# CONFIG_UBIATTACH is not set
|
||||
|
@ -1008,6 +1016,7 @@ CONFIG_DHCPD_LEASES_FILE=""
|
|||
# CONFIG_FEATURE_UDHCPC_ARPING is not set
|
||||
# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
|
||||
CONFIG_UDHCPC_DEFAULT_SCRIPT=""
|
||||
CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
|
||||
# CONFIG_UDHCPC6 is not set
|
||||
# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
|
||||
# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
|
||||
|
@ -1138,6 +1147,7 @@ CONFIG_ASH_JOB_CONTROL=y
|
|||
CONFIG_ASH_ECHO=y
|
||||
CONFIG_ASH_PRINTF=y
|
||||
CONFIG_ASH_TEST=y
|
||||
CONFIG_ASH_SLEEP=y
|
||||
# CONFIG_ASH_HELP is not set
|
||||
CONFIG_ASH_GETOPTS=y
|
||||
# CONFIG_ASH_CMDCMD is not set
|
||||
|
|
|
@ -1,14 +1,13 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.35.0
|
||||
# Tue Sep 13 18:32:09 2022
|
||||
# Busybox version: 1.36.0
|
||||
# Tue Feb 7 18:36:29 2023
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
#
|
||||
# Settings
|
||||
#
|
||||
CONFIG_PLATFORM_LINUX=y
|
||||
CONFIG_DESKTOP=y
|
||||
# CONFIG_EXTRA_COMPAT is not set
|
||||
# CONFIG_FEDORA_COMPAT is not set
|
||||
|
@ -94,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
|
|||
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
|
||||
CONFIG_PASSWORD_MINLEN=6
|
||||
CONFIG_MD5_SMALL=0
|
||||
CONFIG_SHA1_SMALL=3
|
||||
CONFIG_SHA1_HWACCEL=y
|
||||
CONFIG_SHA256_HWACCEL=y
|
||||
CONFIG_SHA3_SMALL=0
|
||||
CONFIG_FEATURE_NON_POSIX_CP=y
|
||||
CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
|
||||
|
@ -124,6 +126,9 @@ CONFIG_UNICODE_WIDE_WCHARS=y
|
|||
# CONFIG_UNICODE_BIDI_SUPPORT is not set
|
||||
# CONFIG_UNICODE_NEUTRAL_TABLE is not set
|
||||
# CONFIG_UNICODE_PRESERVE_BROKEN is not set
|
||||
# CONFIG_LOOP_CONFIGURE is not set
|
||||
# CONFIG_NO_LOOP_CONFIGURE is not set
|
||||
CONFIG_TRY_LOOP_CONFIGURE=y
|
||||
|
||||
#
|
||||
# Applets
|
||||
|
@ -339,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y
|
|||
CONFIG_FEATURE_TR_EQUIV=y
|
||||
CONFIG_TRUE=y
|
||||
# CONFIG_TRUNCATE is not set
|
||||
CONFIG_TSORT=y
|
||||
CONFIG_TTY=y
|
||||
CONFIG_UNAME=y
|
||||
CONFIG_UNAME_OSNAME="GNU/Linux"
|
||||
|
@ -832,10 +838,12 @@ CONFIG_NANDWRITE=y
|
|||
# CONFIG_RFKILL is not set
|
||||
# CONFIG_RUNLEVEL is not set
|
||||
# CONFIG_RX is not set
|
||||
CONFIG_SEEDRNG=y
|
||||
# CONFIG_SETFATTR is not set
|
||||
CONFIG_SETSERIAL=y
|
||||
# CONFIG_STRINGS is not set
|
||||
CONFIG_TIME=y
|
||||
CONFIG_TREE=y
|
||||
# CONFIG_TS is not set
|
||||
CONFIG_TTYSIZE=y
|
||||
# CONFIG_UBIATTACH is not set
|
||||
|
@ -1008,6 +1016,7 @@ CONFIG_DHCPD_LEASES_FILE=""
|
|||
# CONFIG_FEATURE_UDHCPC_ARPING is not set
|
||||
# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
|
||||
CONFIG_UDHCPC_DEFAULT_SCRIPT=""
|
||||
CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
|
||||
# CONFIG_UDHCPC6 is not set
|
||||
# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
|
||||
# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
|
||||
|
@ -1138,6 +1147,7 @@ CONFIG_ASH_EXPAND_PRMT=y
|
|||
CONFIG_ASH_ECHO=y
|
||||
CONFIG_ASH_PRINTF=y
|
||||
CONFIG_ASH_TEST=y
|
||||
CONFIG_ASH_SLEEP=y
|
||||
CONFIG_ASH_HELP=y
|
||||
CONFIG_ASH_GETOPTS=y
|
||||
CONFIG_ASH_CMDCMD=y
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# Copyright (C) 2018-present Team CoreELEC (https://coreelec.org)
|
||||
|
||||
PKG_NAME="busybox"
|
||||
PKG_VERSION="1.35.0"
|
||||
PKG_VERSION="1.36.0"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.busybox.net"
|
||||
PKG_URL="http://busybox.net/downloads/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
|
|
|
@ -3,11 +3,10 @@
|
|||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="e2fsprogs"
|
||||
PKG_VERSION="1.45.3"
|
||||
PKG_SHA256="90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595"
|
||||
PKG_VERSION="1.47.0"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://e2fsprogs.sourceforge.net/"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/$PKG_NAME/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/${PKG_NAME}/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS_HOST="gcc:host"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_DEPENDS_INIT="toolchain"
|
||||
|
@ -15,15 +14,15 @@ PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck
|
|||
PKG_BUILD_FLAGS="-parallel"
|
||||
|
||||
if [ "$HFSTOOLS" = "yes" ]; then
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds"
|
||||
PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} diskdev_cmds"
|
||||
fi
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \
|
||||
--bindir=$TOOLCHAIN/bin \
|
||||
PKG_CONFIGURE_OPTS_HOST="--prefix=${TOOLCHAIN}/ \
|
||||
--bindir=${TOOLCHAIN}/bin \
|
||||
--with-udev-rules-dir=no \
|
||||
--with-crond-dir=no \
|
||||
--with-systemd-unit-dir=no \
|
||||
--sbindir=$TOOLCHAIN/sbin \
|
||||
--sbindir=${TOOLCHAIN}/sbin \
|
||||
--enable-verbose-makecmds \
|
||||
--disable-symlink-install \
|
||||
--disable-symlink-build \
|
||||
|
@ -70,48 +69,48 @@ pre_configure() {
|
|||
--disable-fuse2fs \
|
||||
--with-gnu-ld"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_INIT"
|
||||
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_INIT --enable-shared --disable-static"
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
make -C lib/et LIBMODE=644 DESTDIR=$SYSROOT_PREFIX install
|
||||
make -C lib/et LIBMODE=644 DESTDIR=${SYSROOT_PREFIX} install
|
||||
|
||||
rm -rf $INSTALL/usr/sbin/badblocks
|
||||
rm -rf $INSTALL/usr/sbin/blkid
|
||||
rm -rf $INSTALL/usr/sbin/dumpe2fs
|
||||
rm -rf $INSTALL/usr/sbin/e2freefrag
|
||||
rm -rf $INSTALL/usr/sbin/e2undo
|
||||
rm -rf $INSTALL/usr/sbin/e4defrag
|
||||
rm -rf $INSTALL/usr/sbin/filefrag
|
||||
rm -rf $INSTALL/usr/sbin/fsck
|
||||
rm -rf $INSTALL/usr/sbin/logsave
|
||||
rm -rf $INSTALL/usr/sbin/mklost+found
|
||||
rm -rf ${INSTALL}/usr/sbin/badblocks
|
||||
rm -rf ${INSTALL}/usr/sbin/blkid
|
||||
rm -rf ${INSTALL}/usr/sbin/dumpe2fs
|
||||
rm -rf ${INSTALL}/usr/sbin/e2freefrag
|
||||
rm -rf ${INSTALL}/usr/sbin/e2undo
|
||||
rm -rf ${INSTALL}/usr/sbin/e4defrag
|
||||
rm -rf ${INSTALL}/usr/sbin/filefrag
|
||||
rm -rf ${INSTALL}/usr/sbin/fsck
|
||||
rm -rf ${INSTALL}/usr/sbin/logsave
|
||||
rm -rf ${INSTALL}/usr/sbin/mklost+found
|
||||
}
|
||||
|
||||
makeinstall_init() {
|
||||
mkdir -p $INSTALL/usr/sbin
|
||||
cp e2fsck/e2fsck $INSTALL/usr/sbin
|
||||
ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext2
|
||||
ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext3
|
||||
ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext4
|
||||
ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext4dev
|
||||
mkdir -p ${INSTALL}/usr/sbin
|
||||
cp e2fsck/e2fsck ${INSTALL}/usr/sbin
|
||||
ln -sf e2fsck ${INSTALL}/usr/sbin/fsck.ext2
|
||||
ln -sf e2fsck ${INSTALL}/usr/sbin/fsck.ext3
|
||||
ln -sf e2fsck ${INSTALL}/usr/sbin/fsck.ext4
|
||||
ln -sf e2fsck ${INSTALL}/usr/sbin/fsck.ext4dev
|
||||
|
||||
if [ $INITRAMFS_PARTED_SUPPORT = "yes" ]; then
|
||||
cp misc/mke2fs $INSTALL/usr/sbin
|
||||
ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext2
|
||||
ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext3
|
||||
ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext4
|
||||
ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext4dev
|
||||
cp misc/mke2fs ${INSTALL}/usr/sbin
|
||||
ln -sf mke2fs ${INSTALL}/usr/sbin/mkfs.ext2
|
||||
ln -sf mke2fs ${INSTALL}/usr/sbin/mkfs.ext3
|
||||
ln -sf mke2fs ${INSTALL}/usr/sbin/mkfs.ext4
|
||||
ln -sf mke2fs ${INSTALL}/usr/sbin/mkfs.ext4dev
|
||||
fi
|
||||
}
|
||||
|
||||
makeinstall_host() {
|
||||
make -C lib/et LIBMODE=644 install
|
||||
make -C lib/ext2fs LIBMODE=644 install
|
||||
mkdir -p $TOOLCHAIN/sbin
|
||||
cp e2fsck/e2fsck $TOOLCHAIN/sbin
|
||||
cp misc/mke2fs $TOOLCHAIN/sbin
|
||||
cp misc/tune2fs $TOOLCHAIN/sbin
|
||||
mkdir -p $TOOLCHAIN/etc
|
||||
cp misc/mke2fs.conf $TOOLCHAIN/etc
|
||||
mkdir -p ${TOOLCHAIN}/sbin
|
||||
cp e2fsck/e2fsck ${TOOLCHAIN}/sbin
|
||||
cp misc/mke2fs ${TOOLCHAIN}/sbin
|
||||
cp misc/tune2fs ${TOOLCHAIN}/sbin
|
||||
mkdir -p ${TOOLCHAIN}/etc
|
||||
cp misc/mke2fs.conf ${TOOLCHAIN}/etc
|
||||
}
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/misc/mke2fs.conf.in
|
||||
+++ b/misc/mke2fs.conf.in
|
||||
@@ -11,7 +11,7 @@
|
||||
features = has_journal
|
||||
}
|
||||
ext4 = {
|
||||
- features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
|
||||
+ features = has_journal,extent,huge_file,flex_bg,metadata_csum,dir_nlink,extra_isize
|
||||
inode_size = 256
|
||||
}
|
||||
small = {
|
|
@ -2,8 +2,7 @@
|
|||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
|
||||
PKG_NAME="kmod"
|
||||
PKG_VERSION="24"
|
||||
PKG_SHA256="610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397"
|
||||
PKG_VERSION="30"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://git.profusion.mobi/cgit.cgi/kmod.git/"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/utils/kernel/kmod/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="pciutils"
|
||||
PKG_VERSION="3.8.0"
|
||||
PKG_VERSION="3.9.0"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://mj.ucw.cz/pciutils.shtml"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="systemd"
|
||||
PKG_VERSION="251.7"
|
||||
PKG_VERSION="252.5"
|
||||
PKG_LICENSE="LGPL2.1+"
|
||||
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
|
||||
PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz"
|
||||
|
|
|
@ -1,46 +0,0 @@
|
|||
diff -rupN systemd-247.orig/src/shutdown/shutdown.c systemd-247.new/src/shutdown/shutdown.c
|
||||
--- systemd-247.orig/src/shutdown/shutdown.c 2021-02-07 14:43:00.075206218 -0500
|
||||
+++ systemd-247.new/src/shutdown/shutdown.c 2021-02-07 14:43:52.515152573 -0500
|
||||
@@ -540,13 +540,13 @@ int main(int argc, char *argv[]) {
|
||||
log_error_errno(r, "Failed to switch root to \"/run/initramfs\": %m");
|
||||
}
|
||||
|
||||
- if (need_umount || need_swapoff || need_loop_detach || need_dm_detach || need_md_detach)
|
||||
- log_error("Failed to finalize%s%s%s%s%s ignoring.",
|
||||
+ /* if (need_umount || need_swapoff || need_loop_detach || need_dm_detach || need_md_detach)
|
||||
+ log_error("Failed to finalize%s%s%s%s%s ignoring.",
|
||||
need_umount ? " file systems," : "",
|
||||
need_swapoff ? " swap devices," : "",
|
||||
need_loop_detach ? " loop devices," : "",
|
||||
need_dm_detach ? " DM devices," : "",
|
||||
- need_md_detach ? " MD devices," : "");
|
||||
+ need_md_detach ? " MD devices," : ""); */
|
||||
|
||||
/* The kernel will automatically flush ATA disks and suchlike on reboot(), but the file systems need to be
|
||||
* sync'ed explicitly in advance. So let's do this here, but not needlessly slow down containers. Note that we
|
||||
diff -rupN systemd-247.orig/src/shutdown/umount.c systemd-247.new/src/shutdown/umount.c
|
||||
--- systemd-247.orig/src/shutdown/umount.c 2021-02-07 14:43:00.075206218 -0500
|
||||
+++ systemd-247.new/src/shutdown/umount.c 2021-02-07 14:58:13.851587985 -0500
|
||||
@@ -566,8 +566,8 @@ static int umount_with_timeout(MountPoin
|
||||
* filesystem less busy so the unmount might succeed (rather
|
||||
* then return EBUSY).*/
|
||||
r = umount2(m->path, MNT_FORCE);
|
||||
- if (r < 0)
|
||||
- log_full_errno(umount_log_level, errno, "Failed to unmount %s: %m", m->path);
|
||||
+ /* if (r < 0)
|
||||
+ log_full_errno(umount_log_level, errno, "Failed to unmount %s: %m", m->path); */
|
||||
|
||||
_exit(r < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
|
||||
}
|
||||
diff -rupN systemd-247.orig/src/volatile-root/volatile-root.c systemd-247.new/src/volatile-root/volatile-root.c
|
||||
--- systemd-247.orig/src/volatile-root/volatile-root.c 2021-02-07 14:43:00.083206834 -0500
|
||||
+++ systemd-247.new/src/volatile-root/volatile-root.c 2021-02-07 14:58:50.713285895 -0500
|
||||
@@ -50,7 +50,7 @@ static int make_volatile(const char *pat
|
||||
|
||||
r = umount_recursive(path, 0);
|
||||
if (r < 0) {
|
||||
- log_error_errno(r, "Failed to unmount %s: %m", path);
|
||||
+ /* log_error_errno(r, "Failed to unmount %s: %m", path); */
|
||||
goto finish_umount;
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
commit 134db60f65ecea9a5c6536541a74a6ff5e4167de
|
||||
Author: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Tue Jan 31 12:06:56 2023 +0000
|
||||
|
||||
glibc: Conditionally #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
|
||||
|
||||
diff --git a/src/basic/linux/btrfs.h b/src/basic/linux/btrfs.h
|
||||
index 0a53bdc38a..74ed9088bd 100644
|
||||
--- a/src/basic/linux/btrfs.h
|
||||
+++ b/src/basic/linux/btrfs.h
|
||||
@@ -26,7 +26,9 @@ extern "C" {
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/ioctl.h>
|
||||
+#if WANT_LINUX_FS_H
|
||||
#include <linux/fs.h>
|
||||
+#endif
|
||||
|
||||
#define BTRFS_IOCTL_MAGIC 0x94
|
||||
#define BTRFS_VOL_NAME_MAX 255
|
|
@ -2,15 +2,14 @@
|
|||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
|
||||
PKG_NAME="usbutils"
|
||||
PKG_VERSION="008"
|
||||
PKG_SHA256="44741af0bae9d402a0ef160a29b2fa700bb656ab5e0a4b3343d51249c2a44c8c"
|
||||
PKG_VERSION="015"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.linux-usb.org/"
|
||||
PKG_URL="http://kernel.org/pub/linux/utils/usb/usbutils/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_URL="http://kernel.org/pub/linux/utils/usb/usbutils/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain libusb systemd"
|
||||
PKG_LONGDESC="This package contains various utilities for inspecting and setting of devices connected to the USB bus."
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/bin/lsusb.py
|
||||
rm -rf $INSTALL/usr/bin/usbhid-dump
|
||||
rm -rf ${INSTALL}/usr/bin/lsusb.py
|
||||
rm -rf ${INSTALL}/usr/bin/usbhid-dump
|
||||
}
|
||||
|
|
|
@ -1,15 +1,24 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2022-present Fewtarius
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="expat"
|
||||
PKG_VERSION="2.5.0"
|
||||
PKG_SHA256="ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://expat.sourceforge.net/"
|
||||
PKG_URL="https://github.com/libexpat/libexpat/releases/download/R_${PKG_VERSION//./_}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
PKG_SITE="https://libexpat.github.io"
|
||||
PKG_URL="https://github.com/libexpat/libexpat/releases/download/R_${PKG_VERSION//./_}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS_HOST="toolchain:host"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="Expat is an XML parser library written in C."
|
||||
|
||||
PKG_CMAKE_OPTS_TARGET="-DBUILD_doc=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
|
||||
PKG_CMAKE_OPTS_HOST="-DBUILD_doc=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
|
||||
|
||||
PKG_CMAKE_OPTS_TARGET="-DEXPAT_BUILD_DOCS=OFF \
|
||||
-DEXPAT_BUILD_TOOLS=OFF \
|
||||
-DEXPAT_BUILD_EXAMPLES=OFF \
|
||||
-DEXPAT_BUILD_TESTS=OFF \
|
||||
-DEXPAT_SHARED_LIBS=ON"
|
||||
PKG_CMAKE_OPTS_HOST="-DEXPAT_BUILD_DOCS=OFF \
|
||||
-DEXPAT_BUILD_TOOLS=OFF \
|
||||
-DEXPAT_BUILD_EXAMPLES=OFF \
|
||||
-DEXPAT_BUILD_TESTS=OFF \
|
||||
-DEXPAT_SHARED_LIBS=ON"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# Copyright (C) 2021 Fewtarius
|
||||
|
||||
PKG_NAME="es-theme-art-book-next"
|
||||
PKG_VERSION="c66f9a4ef63c189411fd85c6c481dc7c68a193bb"
|
||||
PKG_VERSION="fec4fa95b0fc208584626e5dbc468a9fad55c6eb"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="CUSTOM"
|
||||
PKG_SITE="https://github.com/anthonycaccese/art-book-next-batocera"
|
||||
|
|
|
@ -3,8 +3,7 @@
|
|||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="dtc"
|
||||
PKG_VERSION="1.6.0"
|
||||
PKG_SHA256="af720893485b02441f8812773484b286f969d1b8c98769d435a75c6ad524104b"
|
||||
PKG_VERSION="1.6.1"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
|
||||
PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/${PKG_VERSION}.tar.gz"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
|
||||
|
||||
PKG_NAME="git"
|
||||
PKG_VERSION="2.39.0"
|
||||
PKG_VERSION="2.39.1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://git-scm.com/"
|
||||
|
|
|
@ -8,7 +8,7 @@ PKG_SHA256="d34c3b264e8365d16fa9db49179cfa3e9952baaf9275badda0f413966b65955f"
|
|||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="https://www.X.org"
|
||||
PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain util-macros Python3:host"
|
||||
PKG_DEPENDS_TARGET="toolchain util-macros Python3:host Python3"
|
||||
PKG_LONGDESC="X C-language Bindings protocol headers."
|
||||
|
||||
post_makeinstall_target() {
|
||||
|
|
|
@ -172,7 +172,7 @@ CONFIG_SCHED_AUTOGROUP=y
|
|||
# CONFIG_SYSFS_DEPRECATED is not set
|
||||
CONFIG_RELAY=y
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_INITRAMFS_SOURCE="@INITRAMFS_SOURCE@"
|
||||
CONFIG_INITRAMFS_ROOT_UID=0
|
||||
CONFIG_INITRAMFS_ROOT_GID=0
|
||||
CONFIG_RD_GZIP=y
|
||||
|
|
|
@ -121,9 +121,7 @@ TARGET_CONFIGURE_OPTS="--host=${TARGET_NAME} \
|
|||
--sysconfdir=/etc \
|
||||
--libdir=/usr/lib \
|
||||
--libexecdir=/usr/lib \
|
||||
--localstatedir=/var \
|
||||
--disable-static \
|
||||
--enable-shared"
|
||||
--localstatedir=/var"
|
||||
|
||||
TARGET_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CONF} \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
|
@ -146,9 +144,7 @@ HOST_CONFIGURE_OPTS="--host=${HOST_NAME} \
|
|||
--sbindir=${TOOLCHAIN}/sbin \
|
||||
--sysconfdir=${TOOLCHAIN}/etc \
|
||||
--libexecdir=${TOOLCHAIN}/lib \
|
||||
--localstatedir=${TOOLCHAIN}/var \
|
||||
--disable-static \
|
||||
--enable-shared"
|
||||
--localstatedir=${TOOLCHAIN}/var"
|
||||
|
||||
HOST_CMAKE_OPTS="${CMAKE_GENERATOR} \
|
||||
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CONF} \
|
||||
|
|
Loading…
Reference in a new issue