modified: ts/bin/release

modified: ts/build/conf/hwlister/build.conf.example modified: ts/build/conf/installer/thinstation.conf.buildtime modified: ts/build/packages/base/dependencies modified: ts/build/packages/x-common/dependencies
Thinstation · Dec 12, 2020 · 2596306 · 2596306
1 parent 4087d3d
commit 2596306
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/ts/bin/release b/ts/bin/release
@@ -18,7 +18,7 @@ mk_devstat()
 	cp /build/boot-images/initrd/image.md5 /tmp/image-$TSVER.md5
 	cd /tmp/thindev
 	mv lib.squash lib.update
-	tar -c * |xz -9 > ../thindev-default-$TSVER.tar.xz
+	tar -c * |xz > ../thindev-default-$TSVER.tar.xz
 	cd ..
 	scp image-*.md5 ${user}@frs.sourceforge.net:/home/frs/project/thinstation/DevStation-Source/
 	scp thindev-default-*.tar.xz ${user}@frs.sourceforge.net:/home/frs/project/thinstation/DevStation-Source/
@@ -29,7 +29,10 @@ mk_installer()
 	# Make HW lister
 	cd /build
 	cp conf/hwlister/* .
+	sed -i -e 's/^usermode/#usermode/g' /build/packages/switchuser/dependencies
 	stb --allmodules
+	sed -i -e 's/^#usermode/usermode/g' /build/packages/switchuser/dependencies
+
 	mkdir -p /build/boot-images/hw/boot/hwlister/
 	cp /build/boot-images/initrd/{vmlinuz,initrd} /build/boot-images/hw/boot/hwlister/.
 

diff --git a/ts/build/conf/hwlister/build.conf.example b/ts/build/conf/hwlister/build.conf.example
@@ -358,6 +358,7 @@ param haltonerror    false				# Will halt on error, default is true
 param hardlinkfs     true
 param sametimestmp   true                               # When enabled, the timestamps for all files and folders will be set to 00:00 of todays date in your timezone
 param initrdcmd	     "squashfs"				# Compression mode and level of initrd file. none, gzip -9, lzma -9 ,bzip2 -9
+param squashopt      "-comp xz"
 param bootverbosity   3          			# Increased vebosity when booting TS
                                 			#   0 no verbose messages
                                 			#   1 boot

diff --git a/ts/build/conf/installer/thinstation.conf.buildtime b/ts/build/conf/installer/thinstation.conf.buildtime
@@ -22,7 +22,7 @@ SESSION_2_AUTOSTART=off
 GTK_THEME=Adwaita
 XFWM4_THEME=Default
 XTERM_CMD="xfce4-terminal"
-INSTALLER_WEB_ADDRESS="http://sourceforge.net/projects/thinstation/files/DevStation-Source"
+INSTALLER_WEB_ADDRESS="https://sourceforge.net/projects/thinstation/files/DevStation-Source"
 INSTALLER_ARCHIVE_NAME="thindev-default-$TS_VERSION.tar.xz"
 INSTALLER_DEV=on
 INSTALLER_REBOOT_MESSAGE_BOX="Please remove the CD and click <b>Next</b> to reboot."

diff --git a/ts/build/packages/base/dependencies b/ts/build/packages/base/dependencies
@@ -6,5 +6,3 @@ acpi
 rngd
 switchuser
 base-nss
-gtkdialog
-messagebox
diff --git a/ts/build/packages/x-common/dependencies b/ts/build/packages/x-common/dependencies
@@ -1,2 +1,4 @@
 base
 freedesktop
+gtkdialog
+messagebox