From 3f193a6f715d9d8a387a6a7615644269ed73547b Mon Sep 17 00:00:00 2001 From: Anders Blomdell <anders.blomdell@control.lth.se> Date: Mon, 30 May 2016 20:40:42 +0200 Subject: [PATCH] Add vxworks files to build requires --- packaging/make_srpm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packaging/make_srpm b/packaging/make_srpm index f7e4430..7b0e159 100755 --- a/packaging/make_srpm +++ b/packaging/make_srpm @@ -111,6 +111,7 @@ License: GPLv3 Source0: labcomm__DESCRIBE__.tar.gz BuildRequires: __CROSS_COMPILE__-gcc +BuildRequires: __VXWORKS__ %description LabComm communication protocol @@ -177,9 +178,9 @@ rpmbuild --define "_topdir $(pwd)/rpmbuild" \ # Create cross compilation spec and .src.rpm (cat << 'EOF' -i586-wrs-vxworks /opt/robot/include/vxworks/5.5.1/ +i586-wrs-vxworks /opt/robot/include/vxworks/5.5.1/ abb_vxworks_5.5.1 EOF -) | while read C_C W_B ; do +) | while read C_C W_B V_W ; do L_D=/usr/${C_C}/lib I_D=/usr/${C_C}/include ( @@ -190,6 +191,7 @@ EOF | sed -e "s|__COMMIT__|${COMMIT}|g" \ | sed -e "s|__CROSS_COMPILE__|${C_C}|g" \ | sed -e "s|__WIND_BASE__|${W_B}|g" \ + | sed -e "s|__VXWORKS__|${V_W}|g" \ | sed -e "s|__LIBDIR__|${L_D}|g" \ | sed -e "s|__INCLUDEDIR__|${I_D}|g" ) > rpmbuild/SPECS/${C_C}-labcomm${SUFFIX}-${VERSION}.spec -- GitLab