From 21b73cfc910327f532e53b889d598a81ac0897d0 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Fri, 20 Dec 2024 09:16:40 +0100
Subject: [PATCH] overlays/erofs-utils: drop patch after upgrade to v1.8.3

This shouldn't be needed anymore after https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=eec6f7a2755dfccc8f655aa37cf6f26db9164e60

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 overlays/erofs-utils-reproducibility.patch | 101 ---------------------
 overlays/nixpkgs.nix                       |   3 -
 2 files changed, 104 deletions(-)
 delete mode 100644 overlays/erofs-utils-reproducibility.patch

diff --git a/overlays/erofs-utils-reproducibility.patch b/overlays/erofs-utils-reproducibility.patch
deleted file mode 100644
index 7f38551ec..000000000
--- a/overlays/erofs-utils-reproducibility.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/lib/inode.c b/lib/inode.c
-index b9dbbd6..385d5b2 100644
---- a/lib/inode.c
-+++ b/lib/inode.c
-@@ -1413,69 +1413,63 @@ static void erofs_mkfs_flushjobs(struct erofs_sb_info *sbi)
- static int erofs_mkfs_handle_directory(struct erofs_inode *dir)
- {
- 	struct erofs_sb_info *sbi = dir->sbi;
--	DIR *_dir;
- 	struct dirent *dp;
-+	struct dirent **entries;
-+	int i;
- 	struct erofs_dentry *d;
- 	unsigned int nr_subdirs, i_nlink;
- 	int ret;
-
--	_dir = opendir(dir->i_srcpath);
--	if (!_dir) {
--		erofs_err("failed to opendir at %s: %s",
-+	i = scandir(dir->i_srcpath, &entries, NULL, alphasort);
-+	if (i == -1) {
-+		erofs_err("failed to scandir at %s: %s",
- 			  dir->i_srcpath, erofs_strerror(-errno));
- 		return -errno;
- 	}
-
- 	nr_subdirs = 0;
- 	i_nlink = 0;
--	while (1) {
-+	while (i--) {
- 		char buf[PATH_MAX];
- 		struct erofs_inode *inode;
-
--		/*
--		 * set errno to 0 before calling readdir() in order to
--		 * distinguish end of stream and from an error.
--		 */
--		errno = 0;
--		dp = readdir(_dir);
--		if (!dp) {
--			if (!errno)
--				break;
--			ret = -errno;
--			goto err_closedir;
--		}
-+		dp = entries[i];
-
- 		if (is_dot_dotdot(dp->d_name)) {
- 			++i_nlink;
-+			free(dp);
- 			continue;
- 		}
-
- 		/* skip if it's a exclude file */
--		if (erofs_is_exclude_path(dir->i_srcpath, dp->d_name))
-+		if (erofs_is_exclude_path(dir->i_srcpath, dp->d_name)) {
-+			free(dp);
- 			continue;
-+		}
-
- 		d = erofs_d_alloc(dir, dp->d_name);
- 		if (IS_ERR(d)) {
- 			ret = PTR_ERR(d);
--			goto err_closedir;
-+			goto err_free;
- 		}
-
- 		ret = snprintf(buf, PATH_MAX, "%s/%s", dir->i_srcpath, d->name);
- 		if (ret < 0 || ret >= PATH_MAX)
--			goto err_closedir;
-+			goto err_free;
-
- 		inode = erofs_iget_from_srcpath(sbi, buf);
- 		if (IS_ERR(inode)) {
- 			ret = PTR_ERR(inode);
--			goto err_closedir;
-+			goto err_free;
- 		}
- 		d->inode = inode;
- 		d->type = erofs_mode_to_ftype(inode->i_mode);
- 		i_nlink += S_ISDIR(inode->i_mode);
- 		erofs_dbg("file %s added (type %u)", buf, d->type);
- 		nr_subdirs++;
-+		free(dp);
- 	}
--	closedir(_dir);
-+	free(entries);
-
- 	ret = erofs_init_empty_dir(dir);
- 	if (ret)
-@@ -1497,8 +1491,9 @@ static int erofs_mkfs_handle_directory(struct erofs_inode *dir)
-
- 	return erofs_mkfs_go(sbi, EROFS_MKFS_JOB_DIR, &dir, sizeof(dir));
-
--err_closedir:
--	closedir(_dir);
-+err_free:
-+	free(dp);
-+	free(entries);
- 	return ret;
- }
diff --git a/overlays/nixpkgs.nix b/overlays/nixpkgs.nix
index 5561b6b42..76048fdaf 100644
--- a/overlays/nixpkgs.nix
+++ b/overlays/nixpkgs.nix
@@ -19,9 +19,6 @@ final: prev:
   };
 
   erofs-utils = prev.erofs-utils.overrideAttrs (prev: {
-    patches = final.lib.optionals (prev ? patches) prev.patches ++ [
-      ./erofs-utils-reproducibility.patch
-    ];
     # The build environment sets SOURCE_DATE_EPOCH to 1980, but as mkfs.erofs
     # implements timestamp clamping, and files from the store have a 1970
     # timestamp, we end up with different file metadata in the image