diff options
| author | Simon Rettberg | 2024-06-11 09:52:25 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2024-06-11 09:52:25 +0200 |
| commit | 5928bf792e77b15d026d1be8968958af74c32924 (patch) | |
| tree | 1d9b82d40c86f67eb3d58b718f35292dbbdbaeda | |
| parent | Fix misleading message (diff) | |
| download | systemd-init-5928bf792e77b15d026d1be8968958af74c32924.tar.gz systemd-init-5928bf792e77b15d026d1be8968958af74c32924.tar.xz systemd-init-5928bf792e77b15d026d1be8968958af74c32924.zip | |
[busybox] Update to 1.36.1
| -rwxr-xr-x | modules.d/busybox/module-setup.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules.d/busybox/module-setup.sh b/modules.d/busybox/module-setup.sh index b068eabc..84edfd96 100755 --- a/modules.d/busybox/module-setup.sh +++ b/modules.d/busybox/module-setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -[ -z "$BB_GIT" ] && declare -rg BB_GIT="git://git.busybox.net/busybox" -[ -z "$BB_BRANCH" ] && declare -rg BB_BRANCH="1_31_1" +[ -z "$BB_GIT" ] && declare -rg BB_GIT="https://git.busybox.net/busybox" +[ -z "$BB_BRANCH" ] && declare -rg BB_BRANCH="1_36_1" build() ( local base_url="https://git.openslx.org/openslx-ng/mltk.git/plain/core/modules/busybox/" @@ -8,8 +8,11 @@ build() ( git clone --depth 1 "$BB_GIT" --branch "$BB_BRANCH" "${moddir}/src" # apply patches cd "${moddir}/src" - for _patch in "$base_url"/{fbsplash-fillbg,1_31_1-stime,rtcwake-compat,timeout-compat}.patch ; do - curl "$_patch" | git apply - || derror "Failed to apply: $_patch" + for _patch in "$base_url"/{fbsplash-fillbg,rtcwake-compat}.patch ; do + if ! curl -m 10 -L "$_patch" | git apply -; then + derror "Failed to apply: $_patch" + return 1 + fi done cp "${moddir}/openslx.config" "${moddir}/src/.config" yes '' | make oldconfig |