diff options
| author | Michał Łyszczek <michal.lyszczek@bofc.pl> | 2019-02-14 13:28:30 +0100 |
|---|---|---|
| committer | Michał Łyszczek <michal.lyszczek@bofc.pl> | 2019-02-15 00:11:34 +0100 |
| commit | a5fd84ca327d006ef115a5387dbf94fed998fd90 (patch) | |
| tree | 0a38824438af65438a058ca573c5522f0aba9f4c | |
| parent | c26c62e69f09c1cb7f64fb029acdaf8b9e018def (diff) | |
| download | embedlog-a5fd84ca327d006ef115a5387dbf94fed998fd90.tar.gz embedlog-a5fd84ca327d006ef115a5387dbf94fed998fd90.tar.bz2 embedlog-a5fd84ca327d006ef115a5387dbf94fed998fd90.zip | |
fix: some package building problems
no_buildbot
| -rwxr-xr-x | pkg/deb/create-pkg.sh | 4 | ||||
| -rwxr-xr-x | pkg/deb/rules | 2 | ||||
| -rw-r--r-- | pkg/rpm/create-pkg.sh | 8 | ||||
| -rwxr-xr-x | pkg/tgz/create-pkg.sh | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/pkg/deb/create-pkg.sh b/pkg/deb/create-pkg.sh index bebf5d9..f8ad20a 100755 --- a/pkg/deb/create-pkg.sh +++ b/pkg/deb/create-pkg.sh @@ -8,7 +8,7 @@ then echo "usage: ${0} <version> <arch> <host_os>" echo "" echo "where:" - echo " <version> git tag version to build (without prefix v)" + echo " <version> git branch, tag or commit to build" echo " <arch> target architecture" echo " <host_os> target os (debian9, debian8 etc)" echo "" @@ -61,7 +61,7 @@ sed -i "s/@{ABI_VERSION}/${abi_version}/" "debian/control.template" mv "debian/changelog.template" "debian/changelog" mv "debian/control.template" "debian/control" -export CFLAGS="-I/usr/bofc/include" +export CFLAGS="-I/usr/bofc/include -g" export LDFLAGS="-L/usr/bofc/lib" debuild -us -uc || exit 1 diff --git a/pkg/deb/rules b/pkg/deb/rules index 222d161..5f0df93 100755 --- a/pkg/deb/rules +++ b/pkg/deb/rules @@ -5,4 +5,4 @@ export DH_VERBOSE = 1 dh $@ --list-missing --with autoreconf override_dh_auto_test: - $(MAKE) check + LD_LIBRARY_PATH=/usr/bofc/lib $(MAKE) check diff --git a/pkg/rpm/create-pkg.sh b/pkg/rpm/create-pkg.sh index 8f74cf6..fddbf70 100644 --- a/pkg/rpm/create-pkg.sh +++ b/pkg/rpm/create-pkg.sh @@ -72,8 +72,8 @@ else "RPMS/${arch}/${project}-devel-${pkg_version}-${rel_version}.${arch}.rpm" fi -failure=0 -gcc "BUILD/${project}-${git_version}/pkg/test.c" -lembedlog -o /tmp/${project}-test || failure=1 +failed=0 +gcc "BUILD/${project}-${git_version}/pkg/test.c" -lembedlog -o /tmp/${project}-test || failed=1 if ldd /tmp/${project}-test | grep "\/usr\/bofc" then @@ -86,7 +86,7 @@ then failed=1 fi -/tmp/${project}-test || failure=1 +/tmp/${project}-test || failed=1 if type zypper >/dev/null then @@ -99,7 +99,7 @@ fi # should fail as there is no library in te system any more /tmp/${project}-test && failed=1 -if [ ${failure} -eq 1 ] +if [ ${failed} -eq 1 ] then exit 1 fi diff --git a/pkg/tgz/create-pkg.sh b/pkg/tgz/create-pkg.sh index 952ba6f..a5ea8a8 100755 --- a/pkg/tgz/create-pkg.sh +++ b/pkg/tgz/create-pkg.sh @@ -33,7 +33,7 @@ cd "${project}-${git_version}" version="$(grep "AC_INIT(" "configure.ac" | cut -f3 -d\[ | cut -f1 -d\])" ./autogen.sh CFLAGS="-I/usr/bofc/include" LDFLAGS="-L/usr/bofc/lib" ./configure --prefix=/usr -make check +LD_LIBRARY_PATH=/usr/bofc/lib make check mkdir "${workdir}/root" mkdir "${workdir}/root/install" @@ -41,7 +41,7 @@ DESTDIR="${workdir}/root" make install [ -f "pkg/tgz/doinst.sh" ] && cp "pkg/tgz/doinst.sh" "${workdir}/root/install" cd "${workdir}/root" -find . \( -name *.3 -or -name *.7 \) | xargs gzip +find usr/share/man \( -name *.3 -or -name *.7 \) | xargs gzip makepkg -l y -c n "${workdir}/${project}-${version}-${arch}-${revision}.tgz" installpkg "${workdir}/${project}-${version}-${arch}-${revision}.tgz" |