Skip to content

Commit c99bf7e

Browse files
authored
Merge pull request #879 from champtar/ci-fix
ci: also install grub config and systemd unit
2 parents c255353 + 65984bf commit c99bf7e

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.cci.jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ parallel build: {
2121
""")
2222
}
2323
shwrap("""
24-
make install DESTDIR=\$(pwd)/insttree/
24+
make install install-grub-static install-systemd-unit DESTDIR=\$(pwd)/insttree/
2525
tar -c -C insttree/ -zvf insttree.tar.gz .
2626
""")
2727
stash includes: 'insttree.tar.gz', name: 'build'

Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,16 @@ install:
3737
install -D -t "${DESTDIR}$(LIBEXECDIR)" target/${PROFILE}/bootupd
3838
ln -f ${DESTDIR}$(LIBEXECDIR)/bootupd ${DESTDIR}$(PREFIX)/bin/bootupctl
3939

40+
.PHONY: install-grub-static
4041
install-grub-static:
4142
install -m 644 -D -t ${DESTDIR}$(PREFIX)/lib/bootupd/grub2-static src/grub2/*.cfg
4243
install -m 755 -d ${DESTDIR}$(PREFIX)/lib/bootupd/grub2-static/configs.d
4344

45+
.PHONY: install-systemd-unit
4446
install-systemd-unit:
4547
install -m 644 -D -t "${DESTDIR}$(PREFIX)/lib/systemd/system/" systemd/bootloader-update.service
4648

49+
.PHONY: bin-archive
4750
bin-archive:
4851
rm target/inst -rf
4952
$(MAKE) install install-grub-static DESTDIR=$$(pwd)/target/inst

0 commit comments

Comments
 (0)