From 50b52af11abbd227bb7564584ff6d0558f4bc0db Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Sat, 30 Oct 2010 21:37:45 +0200 Subject: [PATCH 1/2] bugfix,docs --- pkg/fedora/README.md | 26 +++++++------------------- pkg/source/make-dist.sh | 2 +- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/pkg/fedora/README.md b/pkg/fedora/README.md index 40ccf7ae3..7d645374f 100644 --- a/pkg/fedora/README.md +++ b/pkg/fedora/README.md @@ -1,13 +1,12 @@ ## Diaspora RPM tools -Creates diaspora source tarballs and RPM packages +Create RPM packages An alternative to the capistrano system, providing classic, binary RPM -packages for deployment on Fedora 13 and OS-independent source tarballs -aimed for packaging purposes. +packages for deployment on Fedora. -#### Fedora RPM synopsis +#### Synopsis Prerequisites: @@ -62,15 +61,15 @@ Typically, this is secondary sources. *make-dist.sh source* applies all patches named *.patch in this directory after checking out source from git. -The spec-files in dist/ are patched by *./make-dist.sh prepare* to reference +The spec-files in dist/ are patched by *./prepare-rpm.sh to reference correct versions of diaspora and diaspora-bundle. The diaspora-bundle is only updated if Gemfile is updated, upgrading diaspora doesn't always require a new diaspora-bundle. Editing spec files should be done -in this directory, changes in dist/ are lost when doing *./make-dist prepare*. +in this directory, changes in dist/ are lost when doing *./prepare-rpm.sh *. The topmost comment's version is patched to reflect the complete version -of current specfile by *make-dist source*. Write the comment in this -directory, copy-paste previous version nr. It will be updated. +of current specfile . Write the comment in this directory, copy-paste +previous version nr. It will be updated. This has been confirmed to start up and provide basic functionality both using the thin webserver and apache passenger, on 32/64 bit systems and in the @@ -79,17 +78,6 @@ at [ftp://mumin.dnsalias.net/pub/leamas/diaspora/builds](ftp://mumin.dnsalias.ne #### Implementation -'make-dist.sh source' script checks out latest version of diaspora into the - dist/diaspora directory. This content is, after some patches, the diaspora package. - -'make-dir.sh bundle' makes a *bundle package* in the diaspora dir. -The resulting bundle is stored in vendor/bundle. This is, after some more -patches, the content of diaspora-bundle tarball. Target systems makes a -*bundle install --local* to use it. - -Here is also support for running the diaspora websocket service as a system -service through /sbin/service and some install scripts. - Diaspora files are stored in /usr/share/diaspora, and owned by root. The bundle, containing some C extensions, is architecture-dependent and lives in /usr/lib[64]/diaspora. Log files are in /var/log/diaspora. Symlinks in diff --git a/pkg/source/make-dist.sh b/pkg/source/make-dist.sh index 125f9dcdd..e96e62ef6 100755 --- a/pkg/source/make-dist.sh +++ b/pkg/source/make-dist.sh @@ -146,12 +146,12 @@ function make_bundle() mv vendor/cache ../$bundle_name/vendor mv vendor/gems ../$bundle_name/vendor mv git-repos ../$bundle_name + git checkout Gemfile cd .. tar czf $bundle_name.tar.gz $bundle_name mv $bundle_name/vendor/cache diaspora/vendor/cache cd .. } - git checkout Gemfile echo echo "Bundle: dist/$bundle_name.tar.gz" } From 205a0a69f21b873ab65630b2093cbe0ce0046ff4 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Sun, 31 Oct 2010 00:02:06 +0200 Subject: [PATCH 2/2] Hlding dist dirs in rep --- pkg/ubuntu/dist | 1 + pkg/ubuntu/dist/.gitkeep | 0 2 files changed, 1 insertion(+) create mode 120000 pkg/ubuntu/dist delete mode 100644 pkg/ubuntu/dist/.gitkeep diff --git a/pkg/ubuntu/dist b/pkg/ubuntu/dist new file mode 120000 index 000000000..378798d00 --- /dev/null +++ b/pkg/ubuntu/dist @@ -0,0 +1 @@ +../source/dist \ No newline at end of file diff --git a/pkg/ubuntu/dist/.gitkeep b/pkg/ubuntu/dist/.gitkeep deleted file mode 100644 index e69de29bb..000000000