packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

embedded-dependencies: Fix ACLOCAL_FLAGS, update for libgsystem 

* Handle the libgsystem submodule
* ACLOCAL_FLAGS was broken
* Add srpm-embedded
This commit is contained in:
Colin Walters 2012-08-17 20:51:36 -04:00
parent f5cf21e471
commit a571c83d82
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile.am
View File

@ -122,11 +122,32 @@ endif
release-tag:
git tag -m "Release $(VERSION)" v$(VERSION)
embed_dependency=tar -C $(srcdir) --append --exclude='.git/*' --transform='s,^embedded-dependencies/,ostree-embeddeps-$(VERSION)/embedded-dependencies/,' --file=ostree-embeddeps-$(VERSION).tar.tmp
embed_dependency=tar -C $(srcdir) --append --exclude='.git/*' --transform="s,^embedded-dependencies/,ostree-embeddeps-$${GITVERSION}/embedded-dependencies/," --file=$${TARFILE_TMP}
git_version_rpm = $$(git describe | sed -e 's,-,\.,g' -e 's,^v,,')
release-tarball-embedded:
(cd $(srcdir); git archive --format=tar --prefix=ostree-embeddeps-$(VERSION)/ HEAD) > ostree-embeddeps-$(VERSION).tar.tmp
$(embed_dependency) embedded-dependencies/glib
$(embed_dependency) embedded-dependencies/libsoup
mv ostree-embeddeps-$(VERSION).tar{.tmp,}
gzip -f ostree-embeddeps-$(VERSION).tar
set -x; \
GITVERSION=$(git_version_rpm); export GITVERSION; \
TARFILE_TMP=ostree-embeddeps-$${GITVERSION}.tar.tmp; \
REV=$$(git rev-parse HEAD); \
echo "Archiving ostree at $${REV}"; \
(cd $(srcdir); git archive --format=tar --prefix=ostree-embeddeps-$${GITVERSION}/ $${REV}) > $${TARFILE_TMP}; \
(cd $$(git rev-parse --show-toplevel); git submodule status) | while read line; do \
rev=$$(echo $$line | cut -f 1 -d ' '); path=$$(echo $$line | cut -f 2 -d ' '); \
echo "Archiving $${path} at $${rev}"; \
(cd $(srcdir)/$$path; git archive --format=tar --prefix=ostree-embeddeps-$${GITVERSION}/$$path/ $${rev}) > submodule.tar; \
tar -A -f $${TARFILE_TMP} submodule.tar; \
rm submodule.tar; \
done; \
echo "Archiving glib"; \
$(embed_dependency) embedded-dependencies/glib; \
echo "Archiving libsoup"; \
$(embed_dependency) embedded-dependencies/libsoup; \
mv ostree-embeddeps-$${GITVERSION}.tar{.tmp,}; \
gzip -f ostree-embeddeps-$${GITVERSION}.tar
srpm-embedded:
GITVERSION=$(git_version_rpm); export GITVERSION; \
(sed -e "s,^Version:.*,Version: $${GITVERSION}," $(srcdir)/packages/ostree.spec.in) > ostree.spec
$(srcdir)/packages/rpmbuild-cwd -bs ostree.spec

2
embedded-dependencies/Makefile.am
View File

@ -29,7 +29,7 @@ build_environment = PATH=$${builddir}/EMBEDDEPS/bin$${PATH:+:$$PATH} \
C_INCLUDE_PATH="$${builddir}/EMBEDDEPS/include$${C_INCLUDE_PATH:+:$$C_INCLUDE_PATH}" \
LDFLAGS="-L$${builddir}/EMBEDDEPS/lib$${LDFLAGS:+:$$LDFLAGS}" \
ACLOCAL_PATH="$${builddir}/EMBEDDEPS/share/aclocal$${ACLOCAL_PATH:+:$$ACLOCAL_PATH}" \
ACLOCAL_FLAGS="-I $${builddir}/EMBEDDEPS/share/aclocal$${ACLOCAL_FLAGS:+:$$ACLOCAL_FLAGS}" \
ACLOCAL_FLAGS="-I $${builddir}/EMBEDDEPS/share/aclocal $${ACLOCAL_FLAGS}" \
PKG_CONFIG_PATH="$${builddir}/EMBEDDEPS/lib/pkgconfig$${PKG_CONFIG_PATH:+:$$PKG_CONFIG_PATH}"
# aclocal aborts if the path doesn't exist yet. Lame. Let's also

4
embedded-dependencies/README
View File

@ -8,12 +8,12 @@ can then be installed on older operating systems.
To create one, use:
$ cd embedded-dependencies
$ make -f Makefile.bootstrap embedded-glib-download
$ make -f Makefile.bootstrap embedded-deps-download
$ cd ..
$ make release-tarball-embedded
To build it:
$ ./configure --enable-embedded-glib ...
$ ./configure --enable-embedded-dependencies ...
as usual.