82a1ba0c78
Use new ubuntu-focal nodeset to build tinyipa images. This is needed to prepare to build tinyipa images based on tinycore 11.x because we need the new kernel 5.x version to be able to chroot. Main changes: - patching tce-load to conform to new squashfs options in the new kernel - installing python3-pip instead of python-pip Story: 2007753 Task: 39943 Change-Id: I3d8a1ab84cae3c7185eb4f9bfefe239fab49a012
21 lines
965 B
Diff
21 lines
965 B
Diff
--- tce-load 2020-05-11 14:53:49.281851377 +0200
|
|
+++ tce-load-new 2020-05-11 14:54:33.300890003 +0200
|
|
@@ -81,7 +81,7 @@
|
|
|
|
copyInstall() {
|
|
[ -d /mnt/test ] || sudo /bin/mkdir -p /mnt/test
|
|
- sudo /bin/mount $1 /mnt/test -t squashfs -o loop,ro,bs=4096
|
|
+ sudo /bin/mount $1 /mnt/test -t squashfs -o loop,ro
|
|
if [ "$?" == 0 ]; then
|
|
if [ "$(ls -A /mnt/test)" ]; then
|
|
yes "$FORCE" | sudo /bin/cp -ai /mnt/test/. / 2>/dev/null
|
|
@@ -135,7 +135,7 @@
|
|
else
|
|
[ -d /tmp/tcloop/"$APPNAME" ] || sudo /bin/mkdir -p /tmp/tcloop/"$APPNAME"
|
|
awk -v appname="/tmp/tcloop/$APPNAME" ' { if ( $2 == appname ) exit 1 }' /etc/mtab
|
|
- [ "$?" == 1 ] || sudo /bin/mount "$THISAPP" /tmp/tcloop/"$APPNAME" -t squashfs -o loop,ro,bs=4096 2>&1
|
|
+ [ "$?" == 1 ] || sudo /bin/mount "$THISAPP" /tmp/tcloop/"$APPNAME" -t squashfs -o loop,ro 2>&1
|
|
[ "$?" == 0 ] || abort_to_saved_dir
|
|
[ "`find /tmp/tcloop/${APPNAME} -mindepth 1 -maxdepth 2 | wc -l`" -le 1 ] && EMPTYEXT=1
|
|
|