diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..da7a389 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,15 @@ +name: CI + +on: [push, pull_request] + +jobs: + Build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Update apt cache + run: sudo apt-get update + - name: Install dependencies + run: sudo apt-get install -y libarchive-tools genisoimage + - name: Build and verify + run: sudo make check VERBOSE=1 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6ca20ba..0000000 --- a/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -sudo: required -dist: trusty -addons: - apt: - packages: - - genisoimage - - bsdtar -script: - - sudo make check VERBOSE=1 diff --git a/BUILD.md b/BUILD.md index b11797b..79629e0 100644 --- a/BUILD.md +++ b/BUILD.md @@ -1,6 +1,6 @@ # mfslinux build instructions -Copyright (c) 2018 Martin Matuska +Copyright (c) 2019 Martin Matuska ## Configuration Read hints in the default configuration files in the config/default directory. diff --git a/Makefile b/Makefile index de74464..aa193d9 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # # Copyright (c) 2018 Martin Matuska # -MFSLINUX_VERSION?= 0.1.5 +MFSLINUX_VERSION?= 0.1.6 GZIP?= $(shell which gzip) MKDIR?= $(shell which mkdir) @@ -46,8 +46,8 @@ ISODIR?= $(WRKDIR)/iso OPENWRT_ROOTDIR?= $(WRKDIR)/openwrt_root OPENWRT_IMGDIR?= $(WRKDIR)/openwrt_root_img -OPENWRT_VERSION= 18.06.2 -OPENWRT_KERNEL_VERSION= 4.14.95 +OPENWRT_VERSION= 19.07.0-rc1 +OPENWRT_KERNEL_VERSION= 4.14.151 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 @@ -169,7 +169,7 @@ download_packages: echo "Downloading: $${PKG}"; \ cd $(DOWNLOADDIR) && $(WGET) $(WGET_ARGS) \ $(OPENWRT_TARGET_URL)/packages/$${PKG}; \ - if [ "$$?" != "0" ]; then exit 1; fi; \ + if [ "$$?" != "0" ]; then rm -f $(DOWNLOADDIR)/$${PKG}; exit 1; fi; \ fi; \ done; \ if [ -f "$(OPENWRT_PACKAGES_ADD)" ]; then \ @@ -183,7 +183,7 @@ download_packages: echo "Downloading: $${PKG}"; \ cd $(DOWNLOADDIR) && $(WGET) $(WGET_ARGS) \ $(OPENWRT_PACKAGES_URL)/$${PKG}; \ - if [ "$$?" != "0" ]; then exit 1; fi; \ + if [ "$$?" != "0" ]; then rm -f $(DOWNLOADDIR)/$${PKGNAME}; exit 1; fi; \ fi; \ done diff --git a/README.md b/README.md index e59ba7f..6a5569e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # mfslinux -Copyright (c) 2018 Martin Matuska +Copyright (c) 2019 Martin Matuska Version 0.1.3 diff --git a/config/default/openwrt_packages_add b/config/default/openwrt_packages_add index ac10a52..76bd27b 100644 --- a/config/default/openwrt_packages_add +++ b/config/default/openwrt_packages_add @@ -1,68 +1,71 @@ -base/uclibcxx_0.2.4-3_x86_64.ipk -base/terminfo_6.1-1_x86_64.ipk -base/libreadline_7.0-1_x86_64.ipk -base/libncurses_6.1-1_x86_64.ipk -base/zlib_1.2.11-2_x86_64.ipk -base/libopenssl_1.0.2q-1_x86_64.ipk -base/libustream-openssl_2018-07-30-23a3f283-1_x86_64.ipk -base/ca-certificates_20180409-2_all.ipk -base/libfdisk_2.32-2_x86_64.ipk -base/libmount_2.32-2_x86_64.ipk -base/fdisk_2.32-2_x86_64.ipk -base/cfdisk_2.32-2_x86_64.ipk -base/sfdisk_2.32-2_x86_64.ipk -base/libevent2_2.0.22-1_x86_64.ipk -base/libpopt_1.16-1_x86_64.ipk -base/libpcap_1.8.1-1_x86_64.ipk -base/tcpdump_4.9.2-1_x86_64.ipk -base/xfs-mkfs_4.11.0-2_x86_64.ipk -base/xfs-growfs_4.11.0-2_x86_64.ipk -base/xfs-fsck_4.11.0-2_x86_64.ipk -base/xfs-admin_4.11.0-2_x86_64.ipk -base/librpc_2015-11-04-a921e3de-1_x86_64.ipk -base/libbz2_1.0.6-4_x86_64.ipk -base/bzip2_1.0.6-4_x86_64.ipk -base/uuidgen_2.32-2_x86_64.ipk -base/mdadm_4.0-4_x86_64.ipk -base/losetup_2.32-2_x86_64.ipk -base/lsblk_2.32-2_x86_64.ipk -base/lscpu_2.32-2_x86_64.ipk -base/ethtool_4.19-1_x86_64.ipk -base/iftop_2017-03-22-949ed0f7-1_x86_64.ipk -packages/atftp_0.7.1-5_x86_64.ipk -packages/dmidecode_3.1-1_x86_64.ipk -packages/less_487-1_x86_64.ipk -packages/libkmod_20-1_x86_64.ipk -packages/pciutils_3.5.6-1_x86_64.ipk -packages/smartmontools_6.6-1_x86_64.ipk -packages/rsync_3.1.3-1_x86_64.ipk -packages/tmux_2.7-1_x86_64.ipk -packages/ipmitool_1.8.18-1_x86_64.ipk +base/uclibcxx_0.2.5-3_x86_64.ipk +base/terminfo_6.1-5_x86_64.ipk +base/libncurses6_6.1-5_x86_64.ipk +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/libfdisk1_2.34-1_x86_64.ipk +base/libmount1_2.34-1_x86_64.ipk +base/fdisk_2.34-1_x86_64.ipk +base/cfdisk_2.34-1_x86_64.ipk +base/sfdisk_2.34-1_x86_64.ipk +base/libevent2-7_2.1.11-1_x86_64.ipk +base/libpopt0_1.16-2_x86_64.ipk +base/libpcap1_1.9.1-1_x86_64.ipk +base/tcpdump_4.9.3-1_x86_64.ipk +base/xfs-mkfs_4.11.0-4_x86_64.ipk +base/xfs-growfs_4.11.0-4_x86_64.ipk +base/xfs-fsck_4.11.0-4_x86_64.ipk +base/xfs-admin_4.11.0-4_x86_64.ipk +base/libbz2-1.0_1.0.8-1_x86_64.ipk +base/bzip2_1.0.8-1_x86_64.ipk +base/uuidgen_2.34-1_x86_64.ipk +base/mdadm_4.1-2_x86_64.ipk +base/losetup_2.34-1_x86_64.ipk +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 +packages/atftp_0.7.2-1_x86_64.ipk +packages/dmidecode_3.2-1_x86_64.ipk +packages/less_530-1_x86_64.ipk +packages/libkmod_20-2_x86_64.ipk +packages/libpci_3.6.2-3_x86_64.ipk +packages/pciutils_3.6.2-3_x86_64.ipk +packages/smartmontools_7.0-3_x86_64.ipk +packages/rsync_3.1.3-2_x86_64.ipk +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_4.4.18-2_x86_64.ipk -packages/bind-libs_9.11.2-P1-1_x86_64.ipk -packages/bind-host_9.11.2-P1-1_x86_64.ipk -packages/bind-dig_9.11.2-P1-1_x86_64.ipk -packages/libdevmapper_2.02.177-1_x86_64.ipk -packages/lvm2_2.02.177-1_x86_64.ipk -packages/libwrap_7.6-1_x86_64.ipk -packages/nfs-utils_2.3.1-1_x86_64.ipk -packages/dosfstools_4.1-1_x86_64.ipk -packages/ntfs-3g_2017.3.23-1-fuseint_x86_64.ipk -packages/libgpg-error_1.12-1_x86_64.ipk -packages/libgcrypt_1.6.6-2_x86_64.ipk -packages/ntfs-3g-utils_2017.3.23-1-fuseint_x86_64.ipk -packages/ntpclient_2010_365-1_x86_64.ipk -packages/libnetsnmp_5.7.3-10_x86_64.ipk -packages/snmp-mibs_5.7.3-10_x86_64.ipk -packages/snmp-utils_5.7.3-10_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/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/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 +packages/ntfs-3g_2017.3.23-2-fuseint_x86_64.ipk +packages/libgpg-error_1.36-3_x86_64.ipk +packages/libgcrypt_1.8.5-1_x86_64.ipk +packages/ntfs-3g-utils_2017.3.23-2-fuseint_x86_64.ipk +packages/ntpclient_2015_365-2_x86_64.ipk +packages/libnetsnmp_5.8-1_x86_64.ipk +packages/snmp-mibs_5.8-1_x86_64.ipk +packages/snmp-utils_5.8-1_x86_64.ipk packages/ifstat_1.1-1_x86_64.ipk -packages/liblzma_5.2.4-1_x86_64.ipk -packages/xz-utils_5.2.4-1_x86_64.ipk -packages/xz_5.2.4-1_x86_64.ipk -packages/tar_1.30-1_x86_64.ipk -packages/nano_3.2-1_x86_64.ipk -packages/vim_8.0.586-2_x86_64.ipk -packages/gdisk_1.0.3-1_x86_64.ipk -packages/cgdisk_1.0.3-1_x86_64.ipk -packages/sgdisk_1.0.3-1_x86_64.ipk +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/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 diff --git a/config/default/openwrt_packages_remove b/config/default/openwrt_packages_remove index d98a6e2..405349c 100644 --- a/config/default/openwrt_packages_remove +++ b/config/default/openwrt_packages_remove @@ -4,6 +4,9 @@ luci-proto-ppp luci-proto-ipv6 luci-mod-admin-full luci-app-firewall +luci-mod-system +luci-mod-status +luci-mod-network luci-base luci-lib-ip luci-lib-jsonc diff --git a/config/default/openwrt_target_packages_add b/config/default/openwrt_target_packages_add index 0c90cb3..ae985d7 100644 --- a/config/default/openwrt_target_packages_add +++ b/config/default/openwrt_target_packages_add @@ -36,4 +36,5 @@ 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 -libstdcpp_7.3.0-1_x86_64.ipk +libatomic1_7.4.0-2_x86_64.ipk +libstdcpp6_7.4.0-2_x86_64.ipk diff --git a/isolinux/boot.txt b/isolinux/boot.txt index 03a9083..072400b 100644 --- a/isolinux/boot.txt +++ b/isolinux/boot.txt @@ -1,4 +1,4 @@ mfslinux %%MFSLINUX_VERSION%% -Copyright (c) 2018 Martin Matuska +Copyright (c) 2019 Martin Matuska a - Boot mfslinux (OpenWrt %%OPENWRT_VERSION%%)