about summary refs log tree commit diff
path: root/pkgs/tools/filesystems
Commit message (Collapse)AuthorAge
* Merge pull request #68250 from jonringer/bump-gcsfuseRenaud2019-10-06
|\ | | | | gcsfuse: 0.23.0 -> 0.28.1
| * gcsfuse: 0.23.0 -> 0.28.1Jonathan Ringer2019-09-07
| |
* | bcachefs: 2019-10-01 (#70217)Vladyslav M2019-10-05
|\ \ | | | | | | bcachefs: 2019-10-01
| * | bcachefs-tools: 2019-09-25 -> 2019-10-01Edmund Wu2019-10-01
| | |
* | | xtreemfs: fix build with openssl-1.1Michael Raskin2019-10-04
| | |
* | | Merge pull request #69745 from worldofpeace/update-f2fs-toolsworldofpeace2019-10-04
|\ \ \ | |/ / |/| | f2fs-tools: 1.11.0 -> 1.13.0
| * | f2fs-tools: 1.11.0 -> 1.13.0worldofpeace2019-09-27
| | |
* | | Merge pull request #69675 from r-ryantm/auto-update/mergerfsRyan Mulligan2019-09-28
|\ \ \ | | | | | | | | mergerfs: 2.28.1 -> 2.28.2
| * | | mergerfs: 2.28.1 -> 2.28.2R. RyanTM2019-09-27
| |/ / | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mergerfs/versions
* | | Merge pull request #67696 from eadwu/bcachefs/update-7Timo Kaufmann2019-09-28
|\ \ \ | | | | | | | | bcachefs/update-7
| * | | bcachefs-tools: 2019-08-21 -> 2019-09-25Edmund Wu2019-09-27
| | | |
* | | | Merge pull request #69541 from r-ryantm/auto-update/fuse-overlayfsRyan Mulligan2019-09-27
|\ \ \ \ | |/ / / |/| | | fuse-overlayfs: 0.5.1 -> 0.6.2
| * | | fuse-overlayfs: 0.5.1 -> 0.6.2R. RyanTM2019-09-26
| |/ / | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fuse-overlayfs/versions
* | | Merge pull request #69481 from r-ryantm/auto-update/btrfs-progsMichael Raskin2019-09-27
|\ \ \ | | | | | | | | btrfs-progs: 5.2.1 -> 5.2.2
| * | | btrfs-progs: 5.2.1 -> 5.2.2R. RyanTM2019-09-26
| |/ / | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/btrfs-progs/versions
* | | Merge pull request #69518 from johanot/ceph-14.2.4Sarah Brofeldt2019-09-26
|\ \ \ | |/ / |/| | ceph: 14.2.3 -> 14.2.4
| * | ceph: 14.2.3 -> 14.2.4Johan Thomsen2019-09-26
| | |
* | | xtreemfs: mark as brokenRobin Gloster2019-09-24
|/ / | | | | | | does not support openssl 1.1
* | squashfsTools: 4.4dev_20180612 -> 4.4 (#68275)Jörg Thalheim2019-09-20
|\ \ | | | | | | squashfsTools: 4.4dev_20180612 -> 4.4
| * | squashfsTools: use updated Darwin patchRuud van Asseldonk2019-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new patch is the patch between 4.4, and commit [1], a pull request at [2] to upsteam Mac and BSD compatibility. That pull request is itself a rebase of an older pull request for an earlier version of squashfs-tools. I squashed all commits between 4.4 and [1], apart from the BSD-specific ones, and exported the new patch from that. Attached below is the git diff --ignore-space-change between squashfs-tools 4.4 with the previous patch applied, and with the new patch applied. [1]: 7d31beec53e6245d3405d6ef2b96e9811ae07044 [2]: https://github.com/plougher/squashfs-tools/pull/69 --- diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c index 8efefe6..5c2f835 100644 --- a/squashfs-tools/info.c +++ b/squashfs-tools/info.c @@ -159,7 +159,7 @@ void *info_thrd(void *arg) case EINTR: continue; default: - BAD_ERROR("sigwaitfailed " + BAD_ERROR("sigwait failed " "because %s\n", strerror(errno)); } } diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c index 67d86a5..3607448 100644 --- a/squashfs-tools/mksquashfs.c +++ b/squashfs-tools/mksquashfs.c @@ -35,7 +35,10 @@ #include <stddef.h> #include <sys/types.h> #include <sys/stat.h> -#ifdef linux +#ifndef linux +#include <sys/sysctl.h> +#else +#include <sys/sysinfo.h> #include <sys/sysmacros.h> #endif #include <fcntl.h> @@ -52,7 +55,6 @@ #include <sys/wait.h> #include <limits.h> #include <ctype.h> -#include <sys/sysinfo.h> #ifndef FNM_EXTMATCH /* glibc extension */ #define FNM_EXTMATCH 0 @@ -5191,7 +5193,17 @@ int parse_mode(char *arg, mode_t *res) int get_physical_memory() { + /* + * Long longs are used here because with PAE, a 32-bit + * machine can have more than 4GB of physical memory + * + * sysconf(_SC_PHYS_PAGES) relies on /proc being mounted. + * If it fails use sysinfo, if that fails return 0 + */ + long long num_pages = sysconf(_SC_PHYS_PAGES); + long long page_size = sysconf(_SC_PAGESIZE); int phys_mem; + #ifndef linux #ifdef HW_MEMSIZE #define SYSCTL_PHYSMEM HW_MEMSIZE @@ -5221,16 +5233,6 @@ int get_physical_memory() } #undef SYSCTL_PHYSMEM #else - /* - * Long longs are used here because with PAE, a 32-bit - * machine can have more than 4GB of physical memory - * - * sysconf(_SC_PHYS_PAGES) relies on /proc being mounted. - * If it fails use sysinfo, if that fails return 0 - */ - long long num_pages = sysconf(_SC_PHYS_PAGES); - long long page_size = sysconf(_SC_PAGESIZE); - if(num_pages == -1 || page_size == -1) { struct sysinfo sys; int res = sysinfo(&sys); diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h index 88d0b5c..1beefef 100644 --- a/squashfs-tools/mksquashfs.h +++ b/squashfs-tools/mksquashfs.h @@ -24,7 +24,6 @@ * mksquashfs.h * */ -#include <pthread.h> struct dir_info { char *pathname; diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c index f8fd529..48e6b27 100644 --- a/squashfs-tools/pseudo.c +++ b/squashfs-tools/pseudo.c @@ -30,7 +30,6 @@ #include <errno.h> #include <string.h> #include <stdlib.h> -#include <sys/stat.h> #include <sys/types.h> #include <sys/wait.h> #include <sys/stat.h> diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c index 00615ce..c1a6183 100644 --- a/squashfs-tools/unsquashfs.c +++ b/squashfs-tools/unsquashfs.c @@ -38,7 +38,6 @@ #include <sys/sysinfo.h> #include <sys/sysmacros.h> #endif - #include <sys/types.h> #include <sys/time.h> #include <sys/resource.h> @@ -1085,7 +1084,7 @@ int create_inode(char *pathname, struct inode *i) break; case SQUASHFS_SYMLINK_TYPE: case SQUASHFS_LSYMLINK_TYPE: { - struct timespec times[2] = { + struct timeval times[2] = { { i->time, 0 }, { i->time, 0 } }; @@ -1104,8 +1103,7 @@ int create_inode(char *pathname, struct inode *i) goto failed; } - res = utimensat(AT_FDCWD, pathname, times, - AT_SYMLINK_NOFOLLOW); + res = lutimes(pathname, times); if(res == -1) { EXIT_UNSQUASH_STRICT("create_inode: failed to set time on " "%s, because %s\n", pathname,
| * | squashfsTools: make Darwin patch apply to 4.4Ruud van Asseldonk2019-09-07
| | | | | | | | | | | | | | | | | | | | | | | | I took the patch, and applied it on top of the previous squashfs-tools commit that we packaged. It applied cleanly. Then I rebased that on top of master, and resolved the conflicts. I'm not sure I resolved them correctly though, I don't have access to Darwin. Somebody needs to review this.
| * | squashfsTools: make alignment patch apply to 4.4Ruud van Asseldonk2019-09-07
| | | | | | | | | | | | | | | | | | | | | | | | I took the patch, and applied it on top of the previous squashfs-tools commit that we packaged (which required editing one line in the patch, as it assumed to be applied on top of the reproducibility patches). Then I rebased that on top of master, resolved one conflict, and I formatted a new patch for this.
| * | squashfsTools: 4.4dev_20180612 -> 4.4Ruud van Asseldonk2019-09-07
| |/ | | | | | | | | | | | | | | | | | | | | A new release has been made upstream. Reproducibility issues were fixed in that release, so we no longer need those patches. For a full overview of the changes, see the 4.4-specific readme at [1]. The alignment patch no longer applies cleanly; I disabled it for now, and I will try to restore it in a follow-up commit. [1]: https://github.com/plougher/squashfs-tools/blob/52eb4c279cd283ed9802dd1ceb686560b22ffb67/README-4.4
* | Merge pull request #66600 from Pamplemousse/sasquatchAaron Andersen2019-09-15
|\ \ | | | | | | sasquatch: init
| * | sasquatch: initPamplemousse2019-09-12
| | |
* | | netatalk: use system netatalkLinus Heckemann2019-09-13
| | |
* | | treewide: remove redundant quotesvolth2019-09-08
| | |
* | | Merge remote-tracking branch 'upstream/gcc-8' into staging-nextFrederik Rietdijk2019-09-08
|\ \ \ | |_|/ |/| | | | | Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
| * | Merge remote-tracking branch 'origin/master' into gcc-8Franz Pletz2019-09-03
| |\|
| * | irods: build with current version of llvmFranz Pletz2019-09-03
| | |
| * | Merge remote-tracking branch 'upstream/master' into gcc-8Robin Gloster2019-08-25
| |\ \
| * | | darling-dmg: 1.0.4 -> 1.0.4+git20180914Franz Pletz2019-06-17
| | | |
| * | | blobfuse: fix build with gcc8Franz Pletz2019-06-17
| | | |
* | | | Merge branch 'master' into staging-nextJan Tojnar2019-09-06
|\ \ \ \
| * | | | ceph: 14.2.1 -> 14.2.3Johan Thomsen2019-09-05
| | | | |
* | | | | Merge branch 'master' into staging-nextJan Tojnar2019-09-06
|\| | | | | | | | | | | | | | | | | | | Fixed trivial conflicts caused by removing rec.
| * | | | ceph: 13.2.4 -> 14.2.1Johan Thomsen2019-09-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove kinetic * release note * add johanot as maintainer nixos/ceph: create option for mgr_module_path - since the upstream default is no longer correct in v14 * fix module, default location for libexec has changed * ceph: fix test
| * | | | ceph: 12.2.7 -> 13.2.4Kristoffer2019-09-04
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maintain only one version * ceph-client: init * include ceph-volume python tool in output nixos/ceph: extraConfig, fix test, wait for ceph-mgr to become active * run ceph with disk group permission * add extraConfig option for the global section needed per cluster * clear up how ceph.conf is generated * fix ceph testcase
* | | | treewide: Remove unnecessary `--disable-static` (#66759)Niklas Hambüchen2019-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * freetype: Remove unnecessary `--disable-static`. The true-by-default `dontDisableStatic` already takes care of it. Fixes freetype not being overridable to have static libs. * treewide: Remove unnecessary `--disable-static`. The true-by-default `dontDisableStatic` already takes care of it. Fixes these packages not being overridable to have static libs.
* | | | treewide: name -> pname (#67513)volth2019-08-31
| | | |
* | | | e2fsprogs: disable failing tests (#65471)Frederik Rietdijk2019-08-31
| | | | | | | | | | | | | | | | Disable several tests that often fail on Hydra but not locally.
* | | | Merge staging-next into stagingFrederik Rietdijk2019-08-31
|\| | |
| * | | Merge master into staging-nextFrederik Rietdijk2019-08-31
| |\ \ \
| | * | | pythonPackage.nixpart0: disable for python3Jonathan Ringer2019-08-30
| | | |/ | | |/|
* | / | treewide: remove redundant recvolth2019-08-28
|/ / /
* | | Merge branch 'master' into staging-nextVladimír Čunát2019-08-25
|\| | | | | | | | | | | | | | | | | | | | There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611
| * | bcachefs-tools: 2019-07-13 -> 2019-08-21Edmund Wu2019-08-23
| | |
* | | Merge branch 'master' into staging-nextVladimír Čunát2019-08-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299
| * | Merge pull request #66736 from markuskowa/upd-glusterMichael Raskin2019-08-20
| |\ \ | | | | | | | | glusterfs: 4.0 -> 6.5
| | * | glusterfs: 4.0 -> 6.5Markus Kowalewski2019-08-18
| | | | | | | | | | | | | | | | | | | | * remove patches (fixed upstream) * python2 -> python3
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-31 16:37:45 +0000