master - NIX: Fedora 19 is now stable. Add builds that include updates.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=adf262e0793c29...
Commit: adf262e0793c29d9c51250bb276c0cc4387a93b5
Parent: 39d00da752c42a8a72d124313a373eaaee94ab28
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Tue Aug 27 02:10:58 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:50 2014 +0100
NIX: Fedora 19 is now stable. Add builds that include updates.
---
release.nix | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/release.nix b/release.nix
index 4fddf5e..357ac3c 100644
--- a/release.nix
+++ b/release.nix
@@ -1,6 +1,6 @@
{ nixpkgs ? <nixpkgs>, lvm2Src, release ? false,
rawhide32 ? "" , rawhide64 ? "" ,
- fc19_32 ? "" , fc19_64 ? "",
+ fc19_32_updates ? "", fc19_64_updates ? "",
fc18_32_updates ? "", fc18_64_updates ? "",
lvm2Nix ? lvm2Src, T ? "" }:
@@ -68,6 +68,7 @@ let
'') { inherit fedora; };
update = version: arch: repodata: orig: orig // (import (pkgs.runCommand "updates-fedora.nix" {} ''
sha=$(grep primary.xml ${repodata} | sed -re 's:.* ([0-9a-f]+)-primary.*:\1:')
+ echo fedora ${version} updates sha: $sha
(echo 'fetchurl: orig: { packagesLists = [ orig.packagesList ('
echo "fetchurl { "
echo " url = \"${fedora_update_url version arch}/repodata/$sha-primary.xml.gz\";"
@@ -79,8 +80,8 @@ let
in {
rawhidex86_64 = rawhide "rawhide" "x86_64" rawhide64;
rawhidei386 = rawhide "rawhide" "i386" rawhide32;
- fedora19x86_64 = rawhide "19" "x86_64" fc19_64;
- fedora19i386 = rawhide "19" "i386" fc19_32;
+ fedora19ux86_64 = update "19" "x86_64" fc19_64_updates pkgs.vmTools.rpmDistros.fedora19x86_64;
+ fedora19ui386 = update "19" "i386" fc19_32_updates pkgs.vmTools.rpmDistros.fedora19i386;
fedora18ux86_64 = update "18" "x86_64" fc18_64_updates pkgs.vmTools.rpmDistros.fedora18x86_64;
fedora18ui386 = update "18" "i386" fc18_32_updates pkgs.vmTools.rpmDistros.fedora18i386;
@@ -133,6 +134,7 @@ let
"dlm" "systemd-devel" "perl-Digest-MD5" ];
fedora18u = fedora18;
fedora19 = [ "dlm-devel" "dlm" "corosynclib-devel" "perl-Digest-MD5" "systemd-devel" "procps-ng" ];
+ fedora19u = fedora19;
rawhide = fedora19;
};
@@ -197,7 +199,9 @@ let
fc16_i386 = mkRPM { arch = "i386" ; image = "fedora16"; };
fc18u_x86_64 = mkRPM { arch = "x86_64"; image = "fedora18u"; };
- fc18u_i386 = mkRPM { arch = "x86_64"; image = "fedora18u"; };
+ fc18u_i386 = mkRPM { arch = "i386"; image = "fedora18u"; };
+ fc19u_x86_64 = mkRPM { arch = "x86_64"; image = "fedora19u"; };
+ fc19u_i386 = mkRPM { arch = "i386"; image = "fedora19u"; };
centos63_i386 = mkRPM { arch = "i386" ; image = "centos63"; };
centos63_x86_64 = mkRPM { arch = "x86_64" ; image = "centos63"; };
10 years, 2 months
master - NIX: Use the new "check_full" target for comprehensive testing.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=39d00da752c42a...
Commit: 39d00da752c42a8a72d124313a373eaaee94ab28
Parent: 765337dcc1721084d40808c48691d236882b844f
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Fri Aug 23 10:14:41 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:50 2014 +0100
NIX: Use the new "check_full" target for comprehensive testing.
---
release.nix | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index 1af5f1e..4fddf5e 100644
--- a/release.nix
+++ b/release.nix
@@ -166,7 +166,7 @@ let
echo "dmsetup targets\\";
echo "dmesg --console-level debug\\";
echo "(/usr/lib/systemd/systemd-udevd || /usr/lib/udev/udevd || find / -name \*udevd) & \\";
- echo "LVM_TEST_DEVDIR=/dev make check T=${T} || touch \$out/nix-support/failed \\"
+ echo "make check_full T=${T} || touch \$out/nix-support/failed \\"
echo "cp -R test/results /tmp/test-results \\"
echo "make lcov && cp -R lcov_reports /tmp/lcov") >> source.inc
sed -e "s,\(device_mapper_version\) [0-9.]*$,\1 $version_dm," \
10 years, 2 months
master - nix: Look a bit harder for udevd.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=765337dcc17210...
Commit: 765337dcc1721084d40808c48691d236882b844f
Parent: 2df5eb250d9dd8d1e9e75faaf0345c9858a7dbdb
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Tue Aug 20 23:04:37 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:50 2014 +0100
nix: Look a bit harder for udevd.
---
release.nix | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index 7b18982..1af5f1e 100644
--- a/release.nix
+++ b/release.nix
@@ -165,7 +165,7 @@ let
echo "make lcov-reset \\";
echo "dmsetup targets\\";
echo "dmesg --console-level debug\\";
- echo "/usr/lib/systemd/systemd-udevd & \\";
+ echo "(/usr/lib/systemd/systemd-udevd || /usr/lib/udev/udevd || find / -name \*udevd) & \\";
echo "LVM_TEST_DEVDIR=/dev make check T=${T} || touch \$out/nix-support/failed \\"
echo "cp -R test/results /tmp/test-results \\"
echo "make lcov && cp -R lcov_reports /tmp/lcov") >> source.inc
10 years, 2 months
master - nix: Set kernel console log level to debug.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2df5eb250d9dd8...
Commit: 2df5eb250d9dd8d1e9e75faaf0345c9858a7dbdb
Parent: 4fc075e04062dfcf4ea3e11c6b5527cf5624089e
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Tue Aug 20 17:34:12 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:50 2014 +0100
nix: Set kernel console log level to debug.
---
release.nix | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/release.nix b/release.nix
index bf72944..7b18982 100644
--- a/release.nix
+++ b/release.nix
@@ -164,6 +164,7 @@ let
echo "%define check_commands \\";
echo "make lcov-reset \\";
echo "dmsetup targets\\";
+ echo "dmesg --console-level debug\\";
echo "/usr/lib/systemd/systemd-udevd & \\";
echo "LVM_TEST_DEVDIR=/dev make check T=${T} || touch \$out/nix-support/failed \\"
echo "cp -R test/results /tmp/test-results \\"
10 years, 2 months
master - nix: Run udevd in foreground.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4fc075e04062df...
Commit: 4fc075e04062dfcf4ea3e11c6b5527cf5624089e
Parent: 4757ef824ce37c110810f245397d3d2500133310
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Tue Aug 20 17:33:38 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:50 2014 +0100
nix: Run udevd in foreground.
---
release.nix | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index fa5ccbd..bf72944 100644
--- a/release.nix
+++ b/release.nix
@@ -164,7 +164,7 @@ let
echo "%define check_commands \\";
echo "make lcov-reset \\";
echo "dmsetup targets\\";
- echo "/usr/lib/systemd/systemd-udevd --daemon || true \\";
+ echo "/usr/lib/systemd/systemd-udevd & \\";
echo "LVM_TEST_DEVDIR=/dev make check T=${T} || touch \$out/nix-support/failed \\"
echo "cp -R test/results /tmp/test-results \\"
echo "make lcov && cp -R lcov_reports /tmp/lcov") >> source.inc
10 years, 2 months
master - NIX: Run tests with /dev and (on recent Fedora) with udevd running.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4757ef824ce37c...
Commit: 4757ef824ce37c110810f245397d3d2500133310
Parent: 9c927f7b275aee128ddd9049a46f44b68edfe130
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Mon Aug 5 21:16:54 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:50 2014 +0100
NIX: Run tests with /dev and (on recent Fedora) with udevd running.
---
release.nix | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index bd12fbb..fa5ccbd 100644
--- a/release.nix
+++ b/release.nix
@@ -164,7 +164,8 @@ let
echo "%define check_commands \\";
echo "make lcov-reset \\";
echo "dmsetup targets\\";
- echo "make check T=${T} || touch \$out/nix-support/failed \\"
+ echo "/usr/lib/systemd/systemd-udevd --daemon || true \\";
+ echo "LVM_TEST_DEVDIR=/dev make check T=${T} || touch \$out/nix-support/failed \\"
echo "cp -R test/results /tmp/test-results \\"
echo "make lcov && cp -R lcov_reports /tmp/lcov") >> source.inc
sed -e "s,\(device_mapper_version\) [0-9.]*$,\1 $version_dm," \
10 years, 2 months
master - NIX: Fix chrooted builds, passing down package lists explicitly.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9c927f7b275aee...
Commit: 9c927f7b275aee128ddd9049a46f44b68edfe130
Parent: a0d3a7d5695ddcbb451e9615471e6b05a2f73047
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Tue Jul 23 11:02:22 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:50 2014 +0100
NIX: Fix chrooted builds, passing down package lists explicitly.
---
release.nix | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/release.nix b/release.nix
index d8b9ed1..bd12fbb 100644
--- a/release.nix
+++ b/release.nix
@@ -68,14 +68,14 @@ let
'') { inherit fedora; };
update = version: arch: repodata: orig: orig // (import (pkgs.runCommand "updates-fedora.nix" {} ''
sha=$(grep primary.xml ${repodata} | sed -re 's:.* ([0-9a-f]+)-primary.*:\1:')
- (echo 'fetchurl: { packagesLists = [ "${orig.packagesList}" ('
+ (echo 'fetchurl: orig: { packagesLists = [ orig.packagesList ('
echo "fetchurl { "
echo " url = \"${fedora_update_url version arch}/repodata/$sha-primary.xml.gz\";"
echo " sha256 = \"$sha\";"
- echo '} ) ]; urlPrefixes = [ "${orig.urlPrefix}" "${fedora_update_url version arch}" ]; }'
+ echo '} ) ]; urlPrefixes = [ orig.urlPrefix "${fedora_update_url version arch}" ]; }'
) > $out
echo built $out 1>&2
- '')) pkgs.fetchurl;
+ '')) pkgs.fetchurl orig;
in {
rawhidex86_64 = rawhide "rawhide" "x86_64" rawhide64;
rawhidei386 = rawhide "rawhide" "i386" rawhide32;
10 years, 2 months
master - NIX: The mergeUsr attribute was renamed to unifiedSystemDir.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a0d3a7d5695ddc...
Commit: a0d3a7d5695ddcbb451e9615471e6b05a2f73047
Parent: cad28a49ab48a08f781594cde0bb73b85f2694a0
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Tue Jul 23 00:26:33 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:50 2014 +0100
NIX: The mergeUsr attribute was renamed to unifiedSystemDir.
---
release.nix | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index 6fd0735..d8b9ed1 100644
--- a/release.nix
+++ b/release.nix
@@ -60,7 +60,7 @@ let
urlPrefix = fedora_url version arch;
archs = ["noarch" arch] ++ (if eqStrings arch "i386" then ["i586" "i686"] else []);
packages = pkgs.vmTools.commonFedoraPackages;
- mergeUsr = true;
+ unifiedSystemDir = true;
};
rawhide = version: arch: repodata: import (pkgs.runCommand "rawhide-${version}-${arch}.nix" {} ''
sha=$(grep primary.xml ${repodata} | sed -re 's:.* ([0-9a-f]+)-primary.*:\1:')
10 years, 2 months
master - NIX: Add default.profile to the spec file.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cad28a49ab48a0...
Commit: cad28a49ab48a08f781594cde0bb73b85f2694a0
Parent: 28143505f83ab0e62de326118c64a834885618fc
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Mon Jul 22 23:38:02 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:50 2014 +0100
NIX: Add default.profile to the spec file.
---
spec/packages.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/spec/packages.inc b/spec/packages.inc
index b6f09f3..98a7848 100644
--- a/spec/packages.inc
+++ b/spec/packages.inc
@@ -141,6 +141,7 @@ fi
%dir %{_sysconfdir}/lvm
%ghost %{_sysconfdir}/lvm/cache/.cache
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/lvm.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/default.profile
%dir %{_sysconfdir}/lvm/backup
%dir %{_sysconfdir}/lvm/cache
%dir %{_sysconfdir}/lvm/archive
10 years, 2 months
master - NIX: Add an fc18 build that includes fedora updates.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=28143505f83ab0...
Commit: 28143505f83ab0e62de326118c64a834885618fc
Parent: c5fbccab21fda0b829e55be7d5045f1dbae1e811
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Mon Jul 22 23:37:17 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:50 2014 +0100
NIX: Add an fc18 build that includes fedora updates.
---
release.nix | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index 503c1f0..6fd0735 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,8 @@
-{ nixpkgs ? <nixpkgs>, lvm2Src, release ? false, rawhide32 ? "" , rawhide64 ? "" , fc19_32 ? "" , fc19_64 ? "", lvm2Nix ? lvm2Src, T ? "" }:
+{ nixpkgs ? <nixpkgs>, lvm2Src, release ? false,
+ rawhide32 ? "" , rawhide64 ? "" ,
+ fc19_32 ? "" , fc19_64 ? "",
+ fc18_32_updates ? "", fc18_64_updates ? "",
+ lvm2Nix ? lvm2Src, T ? "" }:
let
pkgs = import nixpkgs {};
@@ -32,6 +36,7 @@ let
fedora_url = ver: arch: if pkgs.lib.eqStrings ver "rawhide" || pkgs.lib.eqStrings ver "19"
then "ftp://ftp.fi.muni.cz/pub/linux/fedora/linux/development/${ver}/${arch}/os/"
else "mirror://fedora/linux/releases/${ver}/Everything/${arch}/os/";
+ fedora_update_url = ver: arch: "mirror://fedora/linux/updates/${ver}/${arch}";
extra_distros = with pkgs.lib; let
centos = { version, sha, arch }: {
name = "centos-${version}-${arch}";
@@ -61,11 +66,23 @@ let
sha=$(grep primary.xml ${repodata} | sed -re 's:.* ([0-9a-f]+)-primary.*:\1:')
echo '{fedora}: fedora { version = "${version}"; sha = "'$sha'"; arch = "${arch}"; }' > $out
'') { inherit fedora; };
+ update = version: arch: repodata: orig: orig // (import (pkgs.runCommand "updates-fedora.nix" {} ''
+ sha=$(grep primary.xml ${repodata} | sed -re 's:.* ([0-9a-f]+)-primary.*:\1:')
+ (echo 'fetchurl: { packagesLists = [ "${orig.packagesList}" ('
+ echo "fetchurl { "
+ echo " url = \"${fedora_update_url version arch}/repodata/$sha-primary.xml.gz\";"
+ echo " sha256 = \"$sha\";"
+ echo '} ) ]; urlPrefixes = [ "${orig.urlPrefix}" "${fedora_update_url version arch}" ]; }'
+ ) > $out
+ echo built $out 1>&2
+ '')) pkgs.fetchurl;
in {
rawhidex86_64 = rawhide "rawhide" "x86_64" rawhide64;
rawhidei386 = rawhide "rawhide" "i386" rawhide32;
fedora19x86_64 = rawhide "19" "x86_64" fc19_64;
fedora19i386 = rawhide "19" "i386" fc19_32;
+ fedora18ux86_64 = update "18" "x86_64" fc18_64_updates pkgs.vmTools.rpmDistros.fedora18x86_64;
+ fedora18ui386 = update "18" "i386" fc18_32_updates pkgs.vmTools.rpmDistros.fedora18i386;
centos63x86_64 = centos {
version="6.3"; arch="x86_64";
@@ -114,6 +131,7 @@ let
"dlm" "systemd-devel" "perl-Digest-MD5" "libudev-devel" ];
fedora18 = [ "dlm-devel" "corosynclib-devel" "device-mapper-persistent-data"
"dlm" "systemd-devel" "perl-Digest-MD5" ];
+ fedora18u = fedora18;
fedora19 = [ "dlm-devel" "dlm" "corosynclib-devel" "perl-Digest-MD5" "systemd-devel" "procps-ng" ];
rawhide = fedora19;
};
@@ -176,6 +194,9 @@ let
fc16_x86_64 = mkRPM { arch = "x86_64"; image = "fedora16"; };
fc16_i386 = mkRPM { arch = "i386" ; image = "fedora16"; };
+ fc18u_x86_64 = mkRPM { arch = "x86_64"; image = "fedora18u"; };
+ fc18u_i386 = mkRPM { arch = "x86_64"; image = "fedora18u"; };
+
centos63_i386 = mkRPM { arch = "i386" ; image = "centos63"; };
centos63_x86_64 = mkRPM { arch = "x86_64" ; image = "centos63"; };
centos64_i386 = mkRPM { arch = "i386" ; image = "centos64"; };
10 years, 2 months