Update OpenWRT to 19.07.1

Add packages e2fsprogs,resize2fs,cryptsetup
Bump version to 0.1.7
Update copyright notices
Create and upload artifact on github

.github/workflows/ci.yml

@@ -13,3 +13,9 @@ jobs:
         run: sudo apt-get install -y libarchive-tools genisoimage
       - name: Build and verify
         run: sudo make check VERBOSE=1
+      - name: Create artifact
+        run: make artifact VERBOSE=1
+      - uses: actions/upload-artifact@v1
+        with:
+          name: mfslinux-${{ github.sha }}
+          path: mfslinux.iso

BUILD.md

@@ -1,6 +1,6 @@
 # mfslinux build instructions
 
-Copyright (c) 2019 Martin Matuska <mm at FreeBSD.org>
+Copyright (c) 2020 Martin Matuska <mm at matuska dot org>
 
 ## Configuration
 Read hints in the default configuration files in the config/default directory.

Makefile

@@ -1,8 +1,8 @@
 # mfslinux
 #
-# Copyright (c) 2018 Martin Matuska <mm at FreeBSD.org>
+# Copyright (c) 2020 Martin Matuska <mm at matuska dot org>
 #
-MFSLINUX_VERSION?=	0.1.6
+MFSLINUX_VERSION?=	0.1.7
 
 GZIP?=		$(shell which gzip)
 MKDIR?=		$(shell which mkdir)
@@ -20,6 +20,7 @@ CPIO?=		$(shell which cpio)
 OPENSSL?=	$(shell which openssl)
 CHROOT?=	$(shell which chroot)
 TOUCH?=		$(shell which touch)
+LN?=		$(shell which ln)
 GIT?=		$(shell which git)
 MKISOFS?=	$(shell which mkisofs || which genisoimage)
 LS?=		$(shell which ls)
@@ -46,8 +47,8 @@ ISODIR?=	$(WRKDIR)/iso
 OPENWRT_ROOTDIR?=	$(WRKDIR)/openwrt_root
 OPENWRT_IMGDIR?=	$(WRKDIR)/openwrt_root_img
 
-OPENWRT_VERSION=	19.07.0-rc1
-OPENWRT_KERNEL_VERSION=	4.14.151
+OPENWRT_VERSION=	19.07.1
+OPENWRT_KERNEL_VERSION=	4.14.167
 OPENWRT_TARGET_URL=	https://downloads.openwrt.org/releases/$(OPENWRT_VERSION)/targets/x86/64/
 OPENWRT_PACKAGES_URL=	http://downloads.openwrt.org/releases/$(OPENWRT_VERSION)/packages/x86_64/
 OPENWRT_ROOTFS_TAR=	openwrt-$(OPENWRT_VERSION)-x86-64-generic-rootfs.tar.gz
@@ -68,6 +69,7 @@ ROOT_SHELL?=	/bin/bash
 GIT_REVISION=	$(shell $(GIT) rev-parse --short HEAD)
 
 OUTPUT_ISO?=	mfslinux-$(MFSLINUX_VERSION)-$(GIT_REVISION).iso
+ARTIFACT?=	mfslinux.iso
 OUTPUT_ISO_LABEL?=	mfslinux
 
 VERBOSE?=	0
@@ -295,11 +297,16 @@ check: iso
 		fi
 	$(_v)$(BSDTAR) -t -v -f $(OUTPUT_ISO)
 
+artifact: iso $(ARTIFACT)
+$(ARTIFACT): $(OUTPUT_ISO)
+	$(_v)echo Symlinking ISO file
+	$(_v)$(LN) -s $(OUTPUT_ISO) $(ARTIFACT)
+
 clean-download:
 	$(_v)if [ "$(DOWNLOADDIR)" != "/" ]; then $(RM) -rf $(DOWNLOADDIR); fi
 
 clean:
 	$(_v)if [ "$(WRKDIR)" != "/" ]; then $(RM) -rf $(WRKDIR); fi
-	$(_v)$(RM) -f $(OUTPUT_ISO)
+	$(_v)$(RM) -f $(OUTPUT_ISO) $(ARTIFACT)
 
 clean-all: clean clean-download

README.md

@@ -1,8 +1,8 @@
 # mfslinux
 
-Copyright (c) 2019 Martin Matuska <mm at FreeBSD.org>
+Copyright (c) 2020 Martin Matuska <martin at matuska dot org>
 
-Version 0.1.3
+Version 0.1.7
 
 ## Description
 

config/default/openwrt_packages_add

@@ -5,7 +5,7 @@ base/libreadline8_8.0-1_x86_64.ipk
 base/zlib_1.2.11-3_x86_64.ipk
 base/libopenssl1.1_1.1.1d-2_x86_64.ipk
 base/libustream-openssl20150806_2019-11-05-c9b66682-2_x86_64.ipk
-base/ca-certificates_20190110-1_all.ipk
+base/ca-certificates_20190110-2_all.ipk
 base/libfdisk1_2.34-1_x86_64.ipk
 base/libmount1_2.34-1_x86_64.ipk
 base/fdisk_2.34-1_x86_64.ipk
@@ -28,6 +28,8 @@ base/lsblk_2.34-1_x86_64.ipk
 base/lscpu_2.34-1_x86_64.ipk
 base/ethtool_5.2-1_x86_64.ipk
 base/iftop_2018-10-03-77901c8c-1_x86_64.ipk
+base/e2fsprogs_1.44.5-2_x86_64.ipk
+base/resize2fs_1.44.5-2_x86_64.ipk
 packages/atftp_0.7.2-1_x86_64.ipk
 packages/dmidecode_3.2-1_x86_64.ipk
 packages/less_530-1_x86_64.ipk
@@ -40,14 +42,14 @@ packages/tmux_2.9a-1_x86_64.ipk
 packages/ipmitool_1.8.18-3_x86_64.ipk
 packages/netcat_0.7.1-1_x86_64.ipk
 packages/bash_5.0-3_x86_64.ipk
-packages/bind-libs_9.14.7-1_x86_64.ipk
-packages/bind-host_9.14.7-1_x86_64.ipk
-packages/bind-dig_9.14.7-1_x86_64.ipk
+packages/bind-libs_9.14.8-1_x86_64.ipk
+packages/bind-host_9.14.8-1_x86_64.ipk
+packages/bind-dig_9.14.8-1_x86_64.ipk
 packages/libdevmapper_2.03.02-2_x86_64.ipk
 packages/libaio_0.3.111-2_x86_64.ipk
 packages/lvm2_2.03.02-2_x86_64.ipk
 packages/libwrap_7.6-2_x86_64.ipk
-packages/libtirpc_1.1.4-1_x86_64.ipk
+packages/libtirpc_1.2.5-1_x86_64.ipk
 packages/libkeyutils1_1.6-3_x86_64.ipk
 packages/nfs-utils_2.3.4-2_x86_64.ipk
 packages/dosfstools_4.1-4_x86_64.ipk
@@ -64,8 +66,10 @@ packages/liblzma_5.2.4-5_x86_64.ipk
 packages/xz-utils_5.2.4-5_x86_64.ipk
 packages/xz_5.2.4-5_x86_64.ipk
 packages/tar_1.32-1_x86_64.ipk
-packages/nano_4.5-1_x86_64.ipk
+packages/nano_4.8-1_x86_64.ipk
 packages/vim_8.1-5_x86_64.ipk
 packages/gdisk_1.0.4-2_x86_64.ipk
 packages/cgdisk_1.0.4-2_x86_64.ipk
 packages/sgdisk_1.0.4-2_x86_64.ipk
+packages/cryptsetup_2.1.0-2_x86_64.ipk
+

config/default/openwrt_target_packages_add

@@ -36,5 +36,14 @@ kmod-hid_%%KERNEL_VERSION%%-1_x86_64.ipk
 kmod-hid-generic_%%KERNEL_VERSION%%-1_x86_64.ipk
 kmod-usb-hid_%%KERNEL_VERSION%%-1_x86_64.ipk
 kmod-usb-storage_%%KERNEL_VERSION%%-1_x86_64.ipk
-libatomic1_7.4.0-2_x86_64.ipk
-libstdcpp6_7.4.0-2_x86_64.ipk
+kmod-crypto-gf128_%%KERNEL_VERSION%%-1_x86_64.ipk
+kmod-crypto-xts_%%KERNEL_VERSION%%-1_x86_64.ipk
+kmod-crypto-hmac_%%KERNEL_VERSION%%-1_x86_64.ipk
+kmod-crypto-sha256_%%KERNEL_VERSION%%-1_x86_64.ipk
+kmod-crypto-rng_%%KERNEL_VERSION%%-1_x86_64.ipk
+kmod-crypto-wq_%%KERNEL_VERSION%%-1_x86_64.ipk
+kmod-crypto-iv_%%KERNEL_VERSION%%-1_x86_64.ipk
+kmod-crypto-misc_%%KERNEL_VERSION%%-1_x86_64.ipk
+kmod-crypto-user_%%KERNEL_VERSION%%-1_x86_64.ipk
+libatomic1_7.5.0-2_x86_64.ipk
+libstdcpp6_7.5.0-2_x86_64.ipk

isolinux/boot.txt

@@ -1,4 +1,4 @@
 mfslinux %%MFSLINUX_VERSION%%
-Copyright (c) 2019 Martin Matuska <mm at FreeBSD.org>
+Copyright (c) 2020 Martin Matuska <mm at matuska dot org>
 
 a - Boot mfslinux (OpenWrt %%OPENWRT_VERSION%%)

isolinux/isolinux.cfg

@@ -1,5 +1,5 @@
 # mfslinux
-# Copyright (c) 2018 Martin Matuska <mm at FreeBSD.org>
+# Copyright (c) 2020 Martin Matuska <mm at matuska dot org>
 #
 display boot.txt
 prompt 1