diff --git a/makefile b/makefile index 4210ea1..060ccfe 100644 --- a/makefile +++ b/makefile @@ -6,59 +6,59 @@ endif helm-amd64: clean lint paths package build helm-amd64.yaml time nice $(as_root) vmdb2 --verbose cache/amd64.yaml --output=cache/amd64.img --log build.log - $(as_root) chown $(shell whoami):$(shell whoami) builds/helm-$(shell project version)-hoobs-amd64.deb - dpkg-sig --sign builder builds/helm-$(shell project version)-hoobs-amd64.deb + $(as_root) chown $(shell whoami):$(shell whoami) builds/helm-$(shell ./project version)-hoobs-amd64.deb + dpkg-sig --sign builder builds/helm-$(shell ./project version)-hoobs-amd64.deb rm -fR cache helm-arm64: clean lint paths package build helm-arm64.yaml time nice $(as_root) vmdb2 --verbose cache/arm64.yaml --output=cache/arm64.img --log build.log - $(as_root) chown $(shell whoami):$(shell whoami) builds/helm-$(shell project version)-hoobs-arm64.deb - dpkg-sig --sign builder builds/helm-$(shell project version)-hoobs-arm64.deb + $(as_root) chown $(shell whoami):$(shell whoami) builds/helm-$(shell ./project version)-hoobs-arm64.deb + dpkg-sig --sign builder builds/helm-$(shell ./project version)-hoobs-arm64.deb rm -fR cache helm-armhf: clean lint paths package build helm-armhf.yaml time nice $(as_root) vmdb2 --verbose cache/armhf.yaml --output=cache/armhf.img --log build.log - $(as_root) chown $(shell whoami):$(shell whoami) builds/helm-$(shell project version)-hoobs-armhf.deb - dpkg-sig --sign builder builds/helm-$(shell project version)-hoobs-armhf.deb + $(as_root) chown $(shell whoami):$(shell whoami) builds/helm-$(shell ./project version)-hoobs-armhf.deb + dpkg-sig --sign builder builds/helm-$(shell ./project version)-hoobs-armhf.deb rm -fR cache helm-amd64.yaml: cat build.yaml | \ sed "s/__RELEASE__/bullseye/" | \ - sed "s/__VERSION__/$(shell project version)/" | \ + sed "s/__VERSION__/$(shell ./project version)/" | \ sed "s/__SECURITY_SUITE__/bullseye-security/" | \ sed "s/__ARCH__/amd64/" | \ sed "s/__LINUX_IMAGE__/linux-image-amd64/" | \ - sed "s/__NODE_REPO__/$(shell project version nodesource)/" > cache/amd64.yaml + sed "s/__NODE_REPO__/$(shell ./project version nodesource)/" > cache/amd64.yaml cat control | \ - sed "s/__VERSION__/$(shell project version)/" | \ - sed "s/__DEPENDS__/nodejs (>= 16.13.0), libpam-dev, python3, make, gcc, g++/" | \ + sed "s/__VERSION__/$(shell ./project version)/" | \ + sed "s/__DEPENDS__/nodejs (>= 18.15.0), libpam-dev, python3, make, gcc, g++/" | \ sed "s/__ARCH__/amd64/" > cache/control helm-arm64.yaml: cat build.yaml | \ sed "s/__RELEASE__/bullseye/" | \ - sed "s/__VERSION__/$(shell project version)/" | \ + sed "s/__VERSION__/$(shell ./project version)/" | \ sed "s/__SECURITY_SUITE__/bullseye-security/" | \ sed "s/__ARCH__/arm64/" | \ sed "s/__LINUX_IMAGE__/linux-image-arm64/" | \ - sed "s/__NODE_REPO__/$(shell project version nodesource)/" > cache/arm64.yaml + sed "s/__NODE_REPO__/$(shell ./project version nodesource)/" > cache/arm64.yaml cat control | \ - sed "s/__VERSION__/$(shell project version)/" | \ - sed "s/__DEPENDS__/nodejs (>= 16.13.0), libpam-dev, python3, make, gcc, g++/" | \ + sed "s/__VERSION__/$(shell ./project version)/" | \ + sed "s/__DEPENDS__/nodejs (>= 18.15.0), libpam-dev, python3, make, gcc, g++/" | \ sed "s/__ARCH__/arm64/" > cache/control helm-armhf.yaml: cat build.yaml | \ sed "s/__RELEASE__/bullseye/" | \ - sed "s/__VERSION__/$(shell project version)/" | \ + sed "s/__VERSION__/$(shell ./project version)/" | \ sed "s/__SECURITY_SUITE__/bullseye-security/" | \ sed "s/__ARCH__/armhf/" | \ sed "s/__LINUX_IMAGE__/linux-image-armmp/" | \ - sed "s/__NODE_REPO__/$(shell project version nodesource)/" > cache/armhf.yaml + sed "s/__NODE_REPO__/$(shell ./project version nodesource)/" > cache/armhf.yaml cat control | \ - sed "s/__VERSION__/$(shell project version)/" | \ - sed "s/__DEPENDS__/nodejs (>= 16.13.0), libpam-dev, python3, make, gcc, g++/" | \ + sed "s/__VERSION__/$(shell ./project version)/" | \ + sed "s/__DEPENDS__/nodejs (>= 18.15.0), libpam-dev, python3, make, gcc, g++/" | \ sed "s/__ARCH__/armhf/" > cache/control lint: diff --git a/package.json b/package.json index 68c49fe..358e193 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "helm", - "version": "2.1.8", + "version": "2.1.9", "description": "Recovery and remote terminal for the Raspberry Pi.", "license": "GPL-3.0", "repository": { @@ -15,7 +15,7 @@ "name": "Michael J Kellsy" }, "engines": { - "nodesource": "node_16.x" + "nodesource": "node_18.x" }, "dependencies": { "@hoobs/pam": "^1.0.5",