diff --git a/README.md b/README.md index 1bef699..da82870 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,11 @@ Meta repository with references to third party modules and tags to build them. This is very barebones, please improve as you see fit. This at least allows us to pin down the versions for when we need to rebuild everything +## Dependencies +`` +yq +`` + ## How to Create a module yaml file in the `modules` directory, the most common case we build an already tagged version from GFS. diff --git a/build.sh b/build.sh index 155fd68..6ff3d91 100755 --- a/build.sh +++ b/build.sh @@ -18,6 +18,7 @@ repo=$(yq e '.repo' $MODULEYAML) branch=$(yq e '.branch' $MODULEYAML) commit=$(yq e '.commit' $MODULEYAML) makefile=$(yq e '.makefile' $MODULEYAML) +extra=$(yq e '.extraargs' $MODULEYAML) builddir="$WORKDIR/$module" if [ $makefile != null ]; then @@ -42,5 +43,5 @@ else git -C $builddir checkout $commit fi -make -C $builddir $make_args $2 MODULE=$module ARCH_FILTER="RHEL8%" +make -C $builddir $make_args $2 MODULE=$module ARCH_FILTER="RHEL8%" $extra diff --git a/modules/stream.yaml b/modules/stream.yaml new file mode 100644 index 0000000..6d1b582 --- /dev/null +++ b/modules/stream.yaml @@ -0,0 +1,6 @@ +# For now and example, just to prove that we can build from commits +module: stream +repo: git@gitea.psi.ch:epics_driver_modules/StreamDevice.git +branch: master +commit: 2.8.26 +extraargs: CALC=1