master - spec: Add thin-performance.profile to the filelist.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=49ea253aafb518...
Commit: 49ea253aafb518ce12b70637978372768737a168
Parent: 8a0cf9cb0a0e2825d404b3e54ff4db0d2a472541
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Sun Nov 17 18:20:53 2013 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
spec: Add thin-performance.profile to the filelist.
---
spec/packages.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/spec/packages.inc b/spec/packages.inc
index 98a7848..34dc130 100644
--- a/spec/packages.inc
+++ b/spec/packages.inc
@@ -142,6 +142,7 @@ fi
%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
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/thin-performance.profile
%dir %{_sysconfdir}/lvm/backup
%dir %{_sysconfdir}/lvm/cache
%dir %{_sysconfdir}/lvm/archive
10 years, 1 month
master - NIX: Update URL for lcov RPM.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8a0cf9cb0a0e28...
Commit: 8a0cf9cb0a0e2825d404b3e54ff4db0d2a472541
Parent: 7cb3e7d016613ba20e3e86d2e36182cf5f6debac
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Fri Nov 15 22:11:17 2013 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
NIX: Update URL for lcov RPM.
---
release.nix | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index 24db140..0f85493 100644
--- a/release.nix
+++ b/release.nix
@@ -17,7 +17,7 @@ let
# fc16 lcov is broken and el6 has none... be creative
prepareImagePhase = ''
rpm -Uv ${pkgs.fetchurl {
- url="ftp://fr2.rpmfind.net/linux/fedora/linux/updates/16/i386/lcov-1.9-2.fc16....";
+ url="ftp://ftp.isu.edu.tw/pub/Linux/Fedora/linux/updates/16/i386/lcov-1.9-2.fc16.noarch.rpm";
sha256 = "0ycdh5mb7p5ll76mqk0p6gpnjskvxxgh3a3bfr1crh94nvpwhp4z"; }}
'';
postBuild = ''
10 years, 1 month
master - NIX: Skip autoconf, as we include ./configure in git.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7cb3e7d016613b...
Commit: 7cb3e7d016613ba20e3e86d2e36182cf5f6debac
Parent: 2b953df0f97eba540c750f9dd8abe9337210da2d
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Fri Nov 15 19:11:15 2013 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
NIX: Skip autoconf, as we include ./configure in git.
---
release.nix | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/release.nix b/release.nix
index 318ece7..24db140 100644
--- a/release.nix
+++ b/release.nix
@@ -156,6 +156,7 @@ let
then ".pre${toString lvm2Src.revCount}"
else "";
src = lvm2Src;
+ autoconfPhase = ":";
distPhase = ''
set -x
make distclean
10 years, 1 month
master - NIX: Try harder to set dmesg levels.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2b953df0f97eba...
Commit: 2b953df0f97eba540c750f9dd8abe9337210da2d
Parent: fe4d473c5b93ff4f05b623ad841ce23be1357462
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Tue Sep 3 15:48:34 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
NIX: Try harder to set dmesg levels.
---
release.nix | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index e1785c1..318ece7 100644
--- a/release.nix
+++ b/release.nix
@@ -168,7 +168,7 @@ let
echo "%define check_commands \\";
echo "make lcov-reset \\";
echo "dmsetup targets\\";
- echo "dmesg --console-level debug || true\\";
+ echo "dmesg --console-level debug || dmesg 8 || true\\";
echo "(/usr/lib/systemd/systemd-udevd || /usr/lib/udev/udevd || find / -name \*udevd) & \\";
echo "make check_full T=${T} || touch \$out/nix-support/failed \\"
echo "cp -R test/results /tmp/test-results \\"
10 years, 1 month
master - NIX: Give the VMs more RAM (768M instead of 512M).
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fe4d473c5b93ff...
Commit: fe4d473c5b93ff4f05b623ad841ce23be1357462
Parent: 7fea3f44698928d00338981d05604cfefe06fa3f
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Sat Aug 31 10:01:13 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
NIX: Give the VMs more RAM (768M instead of 512M).
---
release.nix | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index 74d4ee8..e1785c1 100644
--- a/release.nix
+++ b/release.nix
@@ -13,7 +13,7 @@ let
fullName = "LVM2";
src = jobs.tarball;
diskImage = diskFun { extraPackages = extras; };
- memSize = 512;
+ memSize = 768;
# fc16 lcov is broken and el6 has none... be creative
prepareImagePhase = ''
rpm -Uv ${pkgs.fetchurl {
10 years, 1 month
master - NIX: Fix a centos64 failure due to old dmesg.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7fea3f44698928...
Commit: 7fea3f44698928d00338981d05604cfefe06fa3f
Parent: 4eaaad0caa339bd548a3b6ece830b682ed7e9033
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Sat Aug 31 01:25:26 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
NIX: Fix a centos64 failure due to old dmesg.
---
release.nix | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index 1a7183f..74d4ee8 100644
--- a/release.nix
+++ b/release.nix
@@ -168,7 +168,7 @@ let
echo "%define check_commands \\";
echo "make lcov-reset \\";
echo "dmsetup targets\\";
- echo "dmesg --console-level debug\\";
+ echo "dmesg --console-level debug || true\\";
echo "(/usr/lib/systemd/systemd-udevd || /usr/lib/udev/udevd || find / -name \*udevd) & \\";
echo "make check_full T=${T} || touch \$out/nix-support/failed \\"
echo "cp -R test/results /tmp/test-results \\"
10 years, 1 month
master - NIX: Do not insmod 9p/virtfs on centos64 as it BUGs out right away.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4eaaad0caa339b...
Commit: 4eaaad0caa339bd548a3b6ece830b682ed7e9033
Parent: 9434611924962e10fb653c8ece93fc69c2ef593a
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Sat Aug 31 01:00:19 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
NIX: Do not insmod 9p/virtfs on centos64 as it BUGs out right away.
---
release.nix | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/release.nix b/release.nix
index 49becd0..1a7183f 100644
--- a/release.nix
+++ b/release.nix
@@ -30,7 +30,7 @@ let
'';
};
- rootmods = [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio"
+ rootmods = [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix"
"cifs" "virtio_net" "unix" "hmac" "md4" "ecb" "des_generic" "sha256" ];
centos_url = ver: arch: "http://ftp.fi.muni.cz/pub/linux/centos/${ver}/os/${arch}/";
@@ -107,9 +107,9 @@ let
};
};
- vm = pkgs: with pkgs.lib; rec {
+ vm = pkgs: xmods: with pkgs.lib; rec {
tools = import "${nixpkgs}/pkgs/build-support/vm/default.nix" {
- inherit pkgs; rootModules = rootmods ++
+ inherit pkgs; rootModules = rootmods ++ xmods ++
[ "loop" "dm_mod" "dm_snapshot" "dm_mirror" "dm_zero" "dm_raid" "dm_thin_pool" ]; };
release = import "${nixpkgs}/pkgs/build-support/release/default.nix" {
pkgs = pkgs // { vmTools = tools; }; };
@@ -140,7 +140,8 @@ let
};
mkRPM = { arch, image }: with pkgs.lib;
- let use = if eqStrings arch "i386" then vm pkgs.pkgsi686Linux else vm pkgs;
+ let use = vm (if eqStrings arch "i386" then pkgs.pkgsi686Linux else pkgs)
+ (if eqStrings image "centos64" then [] else [ "9p" "9pnet_virtio" ]);
in mkVM {
VM = use.rpmbuild;
diskFun = builtins.getAttr "${image}${arch}" use.imgs;
10 years, 1 month
master - NIX: Restore CIFS modules, as 9p is broken on many kernels.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9434611924962e...
Commit: 9434611924962e10fb653c8ece93fc69c2ef593a
Parent: 5f60d53fccfa5224a61ec4ef21bce1004f1142b9
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Sat Aug 31 00:35:11 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
NIX: Restore CIFS modules, as 9p is broken on many kernels.
---
release.nix | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index 357ac3c..49becd0 100644
--- a/release.nix
+++ b/release.nix
@@ -30,7 +30,8 @@ let
'';
};
- rootmods = [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ];
+ rootmods = [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio"
+ "cifs" "virtio_net" "unix" "hmac" "md4" "ecb" "des_generic" "sha256" ];
centos_url = ver: arch: "http://ftp.fi.muni.cz/pub/linux/centos/${ver}/os/${arch}/";
fedora_url = ver: arch: if pkgs.lib.eqStrings ver "rawhide" || pkgs.lib.eqStrings ver "19"
10 years, 1 month
master - NIX: Add %with thin_dump to the specfile.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5f60d53fccfa52...
Commit: 5f60d53fccfa5224a61ec4ef21bce1004f1142b9
Parent: bf67c0b393ca08f909180994f1e03690c3fbdfe1
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Fri Aug 30 18:30:20 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
NIX: Add %with thin_dump to the specfile.
---
spec/source.inc | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/spec/source.inc b/spec/source.inc
index 1cbd8bf..3da93ee 100644
--- a/spec/source.inc
+++ b/spec/source.inc
@@ -16,6 +16,7 @@
%with thin internal
%with thin_check %{_sbindir}/thin_check
%with thin_repair %{_sbindir}/thin_repair
+%with thin_dump %{_sbindir}/thin_dump
%global buildreq_udev systemd-devel
%global req_udev udev >= 181-1
@@ -35,6 +36,7 @@
%with thin
%with thin_check
%with thin_repair
+%with thin_dump
%endif
##############################################################
10 years, 1 month
master - NIX: Add %with thin_repair to the specfile.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=bf67c0b393ca08...
Commit: bf67c0b393ca08f909180994f1e03690c3fbdfe1
Parent: adf262e0793c29d9c51250bb276c0cc4387a93b5
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Fri Aug 30 18:24:25 2013 +0200
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:50 2014 +0100
NIX: Add %with thin_repair to the specfile.
---
spec/source.inc | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/spec/source.inc b/spec/source.inc
index f82ff7b..1cbd8bf 100644
--- a/spec/source.inc
+++ b/spec/source.inc
@@ -15,6 +15,7 @@
# TODO %global req_dm_persistent device-mapper-persistent-data >= 0.1.4
%with thin internal
%with thin_check %{_sbindir}/thin_check
+%with thin_repair %{_sbindir}/thin_repair
%global buildreq_udev systemd-devel
%global req_udev udev >= 181-1
@@ -33,6 +34,7 @@
%global req_cluster openais >= 1.1.1-1, cman >= 3.0.6-1, corosync >= 1.2.0-1
%with thin
%with thin_check
+%with thin_repair
%endif
##############################################################
10 years, 1 month