diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2016-05-24 21:24:59 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2016-05-24 21:24:59 +0000 |
| commit | 1118b1757d67c5e7deb4c9e4b864b00f9d8a8b0c (patch) | |
| tree | cf1411feb617804f8468b98348eff7f377b2ee07 /general.ent | |
| parent | 11ebea60aa77e5a8b24f08971e153d05c12a4406 (diff) | |
Create branches/merge in svn repo fo rtesting of merged LFS books
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11073 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'general.ent')
| -rw-r--r-- | general.ent | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/general.ent b/general.ent index aba0995e5..2a0eb55f7 100644 --- a/general.ent +++ b/general.ent @@ -1,10 +1,15 @@ -<!ENTITY version "SVN-20160516"> -<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;. Change to x.y for release - but not -rc releases --> +<!ENTITY version "SVN-20160516-merge"> +<!ENTITY short-version "svn"> <!-- Used below in &blfs-book; + Change to x.y for release but not -rc releases --> +<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> + +<!ENTITY versiond "20160407-systemd-merge"> +<!ENTITY short-versiond "systemd"> +<!ENTITY generic-versiond "systemd"> + <!ENTITY releasedate "May 16, 2016"> <!ENTITY copyrightdate "1999-2016"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.10"> -<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> <!ENTITY lfs-root "http://www.linuxfromscratch.org/"> <!ENTITY blfs-root "&lfs-root;blfs/"> @@ -18,7 +23,12 @@ <!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/"> <!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/"> <!ENTITY min-kernel "2.6.32"> - + +<!ENTITY patches-rootd "&lfs-root;patches/lfs/&generic-versiond;/"> +<!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/"> +<!ENTITY test-resultsd "&lfs-root;lfs/build-logs/&generic-versiond;/"> +<!ENTITY erratad "&lfs-root;lfs/errata/&generic-versiond;/"> + <!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/"> <!ENTITY anduin-sources "http://anduin.linuxfromscratch.org/LFS"> |