From 9628cf802359abf3ed391422e3a282a9646b0850 Mon Sep 17 00:00:00 2001 From: GuilingQiyu <1369472824@qq.com> Date: Fri, 15 Aug 2025 00:16:40 +0800 Subject: [PATCH 1/3] Packages (Linux): fixes Linglong detection on Deepin --- src/detection/packages/packages_linux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c index 04bf4935b5..33360870ef 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c @@ -451,6 +451,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts, packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/repo/refs/heads/main", true); if (packageCounts->linglong == 0) packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/repo/refs/remotes/stable/main", true); + packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/repo/refs/remotes/ci/main", true); } if (!(options->disabled & FF_PACKAGES_FLAG_PACSTALL_BIT)) packageCounts->pacstall += getNumElements(baseDir, "/var/lib/pacstall/metadata", false); if (!(options->disabled & FF_PACKAGES_FLAG_PISI_BIT)) packageCounts->pisi += getNumElements(baseDir, "/var/lib/pisi/package", true); From c54163dc6e284f35e2cad12a728a4ab63e4c2caa Mon Sep 17 00:00:00 2001 From: Guiling Qiyu <114603828+GuilingQiyu@users.noreply.github.com> Date: Fri, 15 Aug 2025 01:22:52 +0800 Subject: [PATCH 2/3] Packages (Linux): fixes Linglong detection to count layers --- src/detection/packages/packages_linux.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c index 33360870ef..fad4ff7d73 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c @@ -446,13 +446,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts, { packageCounts->guixSystem += getGuixPackages(baseDir, "/run/current-system/profile"); } - if (!(options->disabled & FF_PACKAGES_FLAG_LINGLONG_BIT)) - { - packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/repo/refs/heads/main", true); - if (packageCounts->linglong == 0) - packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/repo/refs/remotes/stable/main", true); - packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/repo/refs/remotes/ci/main", true); - } + if (!(options->disabled & FF_PACKAGES_FLAG_LINGLONG_BIT))packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/layers", true); if (!(options->disabled & FF_PACKAGES_FLAG_PACSTALL_BIT)) packageCounts->pacstall += getNumElements(baseDir, "/var/lib/pacstall/metadata", false); if (!(options->disabled & FF_PACKAGES_FLAG_PISI_BIT)) packageCounts->pisi += getNumElements(baseDir, "/var/lib/pisi/package", true); if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT)) packageCounts->pkgsrc += getNumElements(baseDir, "/usr/pkg/pkgdb", DT_DIR); From 736c871a1c83e6093f9b42e99fd76c534e67b87e Mon Sep 17 00:00:00 2001 From: Carter Li Date: Thu, 14 Aug 2025 19:41:25 -0500 Subject: [PATCH 3/3] Update src/detection/packages/packages_linux.c --- src/detection/packages/packages_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c index fad4ff7d73..fbd607413c 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c @@ -446,7 +446,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts, { packageCounts->guixSystem += getGuixPackages(baseDir, "/run/current-system/profile"); } - if (!(options->disabled & FF_PACKAGES_FLAG_LINGLONG_BIT))packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/layers", true); + if (!(options->disabled & FF_PACKAGES_FLAG_LINGLONG_BIT)) packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/layers", true); if (!(options->disabled & FF_PACKAGES_FLAG_PACSTALL_BIT)) packageCounts->pacstall += getNumElements(baseDir, "/var/lib/pacstall/metadata", false); if (!(options->disabled & FF_PACKAGES_FLAG_PISI_BIT)) packageCounts->pisi += getNumElements(baseDir, "/var/lib/pisi/package", true); if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT)) packageCounts->pkgsrc += getNumElements(baseDir, "/usr/pkg/pkgdb", DT_DIR);