Skip to content

Commit 89c901f

Browse files
authored
Update Linux Kernel version to 6.1.63 & Update Buildroot version to 2023.02.7
- Created patch to allow partclone to build with the newer version of Buildroot. - Updated partclone from v0.3.20 to v0.3.27 - Removed our package for gptfdisk since Buildroot has a newer patched version.
1 parent 71b1a3a commit 89c901f

File tree

15 files changed

+760
-244
lines changed

15 files changed

+760
-244
lines changed

Buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch

Lines changed: 0 additions & 42 deletions
This file was deleted.

Buildroot/package/gptfdisk/Config.in

Lines changed: 0 additions & 52 deletions
This file was deleted.

Buildroot/package/gptfdisk/gptfdisk.hash

Lines changed: 0 additions & 5 deletions
This file was deleted.

Buildroot/package/gptfdisk/gptfdisk.mk

Lines changed: 0 additions & 56 deletions
This file was deleted.

Buildroot/package/partclone/partclone-0.3.20.patch renamed to Buildroot/package/partclone/partclone-0.3.27.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff -Nur partclone-0.3.20_original/src/progress.c partclone-0.3.20_patched/src/progress.c
2-
--- partclone-0.3.20_original/src/progress.c 2022-04-27 01:56:42.000000000 -0500
3-
+++ partclone-0.3.20_patched/src/progress.c 2022-09-12 16:15:01.807055634 -0500
4-
@@ -193,6 +193,47 @@
1+
diff -Nur partclone-0.3.27_original/src/progress.c partclone-0.3.27_patched/src/progress.c
2+
--- partclone-0.3.27_original/src/progress.c 2023-10-04 02:18:19.000000000 -0700
3+
+++ partclone-0.3.27_patched/src/progress.c 2023-10-25 11:47:49.162860998 -0700
4+
@@ -196,6 +196,47 @@
55
strncpy(prog_stat->Rformated, Rformated, sizeof(Rformated)+1);
66
}
77

@@ -49,15 +49,15 @@ diff -Nur partclone-0.3.20_original/src/progress.c partclone-0.3.20_patched/src/
4949
/// update information at progress bar
5050
extern void progress_update(struct progress_bar *prog, unsigned long long copied, unsigned long long current, int done)
5151
{
52-
@@ -214,6 +255,7 @@
52+
@@ -217,6 +258,7 @@
5353
fprintf(stderr, _(", %6.2f%s/min,"), prog_stat.speed, prog_stat.speed_unit);
5454
if(prog->flag == IO)
55-
fprintf(stderr, "\n\r%80c\rcurrent block: %10Lu, total block: %10Lu, Complete: %6.2f%%%s\r", clear_buf, current, prog->total, prog_stat.total_percent, "\x1b[A");
56-
+ fogLogStatusFile(prog, &prog_stat, current);
55+
fprintf(stderr, _("\n\r%80c\rCurrent block: %10Lu, Total block: %10Lu, Complete: %6.2f%%%s\r"), clear_buf, current, prog->total, prog_stat.total_percent, "\x1b[A");
56+
+ fogLogStatusFile(prog, &prog_stat, current);
5757
} else {
5858
setlocale(LC_ALL, "");
5959
bindtextdomain(PACKAGE, LOCALEDIR);
60-
@@ -289,6 +331,7 @@
60+
@@ -294,6 +336,7 @@
6161
wrefresh(p_win);
6262
wrefresh(bar_win);
6363
wrefresh(tbar_win);

Buildroot/package/partclone/partclone.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
PARTCLONE_VERSION = 0.3.20
7+
PARTCLONE_VERSION = 0.3.27
88
PARTCLONE_SOURCE = partclone-$(PARTCLONE_VERSION).tar.gz
99
PARTCLONE_SITE = $(call github,Thomas-Tsai,partclone,$(PARTCLONE_VERSION))
1010
PARTCLONE_INSTALL_STAGING = YES

Buildroot/package/partimage/Config.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ config BR2_PACKAGE_PARTIMAGE
1111
http://www.partimage.org/Main_Page
1212

1313
comment "partimage requires a toolchain with LARGEFILE+WCHAR support"
14-
depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
14+
depends on !(BR2_USE_WCHAR)

build.sh

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
[[ -z $KERNEL_VERSION ]] && KERNEL_VERSION='6.1.22'
4-
[[ -z $BUILDROOT_VERSION ]] && BUILDROOT_VERSION='2022.02.9'
3+
[[ -z $KERNEL_VERSION ]] && KERNEL_VERSION='6.1.63'
4+
[[ -z $BUILDROOT_VERSION ]] && BUILDROOT_VERSION='2023.02.7'
55

66
Usage() {
77
echo -e "Usage: $0 [-knfvh?] [-a x64]"
@@ -153,19 +153,6 @@ cd $buildPath || exit 1
153153

154154
function buildFilesystem() {
155155
local arch="$1"
156-
157-
if [[ -f patch/filesystem/fs.patch ]]; then
158-
dots " * Applying filesystem patch"
159-
echo
160-
patch -p1 < patch/filesystem/fs.patch
161-
if [[ $? -ne 0 ]]; then
162-
echo "Failed"
163-
exit 1
164-
fi
165-
else
166-
echo " * WARNING: Did not find a patch file building filesystem without patches!"
167-
fi
168-
169156
brURL="https://buildroot.org/downloads/buildroot-$BUILDROOT_VERSION.tar.xz"
170157
echo "Preparing buildroot $BUILDROOT_VERSION on $arch build:"
171158
if [[ ! -d fssource$arch ]]; then
@@ -182,8 +169,20 @@ function buildFilesystem() {
182169
mv buildroot-$BUILDROOT_VERSION fssource$arch
183170
echo "Done"
184171
fi
185-
dots "Preparing code"
186172
cd fssource$arch
173+
if [[ -f ../patch/filesystem/fs.patch ]]; then
174+
dots " * Applying filesystem patch"
175+
echo
176+
patch -p1 < ../patch/filesystem/fs.patch
177+
if [[ $? -ne 0 ]]; then
178+
echo "Failed"
179+
exit 1
180+
fi
181+
echo "Done"
182+
else
183+
echo " * WARNING: Did not find any patch file(s), building filesystem without patches!"
184+
fi
185+
dots "Preparing code"
187186
if [[ ! -f .packConfDone ]]; then
188187
cat ../Buildroot/package/newConf.in >> package/Config.in
189188
touch .packConfDone

0 commit comments

Comments
 (0)