[elbe-devel] [PATCH 2/9] elbepack: efilsystem: drop superfluous BuildImgFs

Thomas Weißschuh thomas.weissschuh at linutronix.de
Mon Jul 29 10:46:29 CEST 2024


It is the same as ChRootFilesystem.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 elbepack/efilesystem.py | 4 ----
 elbepack/rfs.py         | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/elbepack/efilesystem.py b/elbepack/efilesystem.py
index 887361aa07dd..ccc47737f936 100644
--- a/elbepack/efilesystem.py
+++ b/elbepack/efilesystem.py
@@ -480,7 +480,3 @@ class TargetFs(ChRootFilesystem):
             packed = packer.pack_file(builddir, img)
             if packed:
                 self.images.append(packed)
-
-
-class BuildImgFs(ChRootFilesystem):
-    pass
diff --git a/elbepack/rfs.py b/elbepack/rfs.py
index 95ad2c30bb77..e13490b7a5fc 100644
--- a/elbepack/rfs.py
+++ b/elbepack/rfs.py
@@ -8,7 +8,7 @@ import os
 import subprocess
 from urllib.parse import urlsplit
 
-from elbepack.efilesystem import BuildImgFs, dpkg_architecture
+from elbepack.efilesystem import ChRootFilesystem, dpkg_architecture
 from elbepack.egpg import unarmor_openpgp_keyring
 from elbepack.shellhelper import chroot, do
 from elbepack.templates import get_preseed, preseed_to_text, write_pack_template
@@ -67,7 +67,7 @@ class BuildEnv:
         self.arch = arch
         self.hostsysroot = hostsysroot
 
-        self.rfs = BuildImgFs(path, xml.defs['userinterpr'])
+        self.rfs = ChRootFilesystem(path, xml.defs['userinterpr'])
 
         if clean:
             self.rfs.rmtree('')

-- 
2.45.2



More information about the elbe-devel mailing list