Skip to content

Commit

Permalink
Build and add fcct
Browse files Browse the repository at this point in the history
As the new comment says:
Yes, this is a hack that loses sane auditing around what git commit
we used to build fcct, etc.  In the future we'll probably give in and package
it or something, see also coreos/fedora-coreos-tracker#235

But for now I want to have it in cosa by default so we can use it;
see also coreos#670
  • Loading branch information
cgwalters committed Dec 19, 2019
1 parent 25a7744 commit bf87dd3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ RUN ./build.sh install_rpms
COPY ./ /root/containerbuild/
RUN ./build.sh write_archive_info
RUN ./build.sh make_and_makeinstall
RUN ./build.sh build_fcct
RUN ./build.sh configure_user

RUN make check
Expand Down
15 changes: 15 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,21 @@ _prep_make_and_make_install() {
fi
}

# Yes, this is a hack that loses sane auditing around what git commit
# we used to build fcct, etc. In the future we'll probably give in and package
# it or something, see also https://github.com/coreos/fedora-coreos-tracker/issues/235
build_fcct() {
cd /tmp
git clone https://github.com/coreos/fcct
cd fcct
git describe --tags --always > /usr/share/fcct-build.revision
./build
fcct=$(find bin -type f -name fcct | head -1)
install -m 0755 -D -t /usr/bin ${fcct}
cd /tmp
rm fcct -rf
}

make_and_makeinstall() {
_prep_make_and_make_install
make && make install
Expand Down

0 comments on commit bf87dd3

Please sign in to comment.