Merge remote-tracking branch 'origin/switch-back-to-jefferson' into j…

…ammy-support
eclipsotic · Jan 31, 2023 · e6131bf · e6131bf
2 parents 63aab27 + 382fb7f
commit e6131bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/fact_extractor/install/unpacker.py b/fact_extractor/install/unpacker.py
@@ -11,7 +11,6 @@
     gcc_is_new,
     install_github_project,
     InstallationError,
-    is_virtualenv,
     OperateInDirectory,
     pip_install_packages, apt_remove_packages,
 )
@@ -225,12 +224,14 @@
             'git+https://github.com/fkie-cad/fact_helper_file.git',
             'patool',
             'archmage',
+            # jefferson + deps
+            'git+https://github.com/sviehb/jefferson.git',
+            'cstruct==2.1',
+            'python-lzo',
             # binwalk
             'git+https://github.com/ReFirmLabs/[email protected]',
             'pyqtgraph',
             'capstone',
-            'cstruct==1.8',
-            'python-lzo',
             'numpy',
             'scipy',
             'git+https://github.com/jrspruitt/[email protected]',  # pinned as broken currently
@@ -254,10 +255,6 @@
         ],
         'github': [
             ('kartone/sasquatch', [f"sed 's/ -Werror / {CFLAGS} /g' -i patches/patch0.txt", './build.sh']),
-            (
-                'svidovich/jefferson-3',
-                ['python3 setup.py install' if is_virtualenv() else 'sudo -EH python3 setup.py install'],
-            ),
             (
                 'rampageX/firmware-mod-kit',
                 ['(cd src && make)', 'cp src/yaffs2utils/unyaffs2 src/untrx src/tpl-tool/src/tpl-tool ../../bin/'],

diff --git a/fact_extractor/plugins/unpacking/jffs2/test/test_plugin_jffs2.py b/fact_extractor/plugins/unpacking/jffs2/test/test_plugin_jffs2.py
@@ -12,7 +12,7 @@ def test_unpacker_selection_generic(self):
         self.check_unpacker_selection('filesystem/jffs2-big', 'JFFS2')
 
     def test_extraction_little(self):
-        self.check_unpacking_of_standard_unpack_set(TEST_DATA_DIR / 'jffs2_be.img', additional_prefix_folder='jffs-root/fs_1')
+        self.check_unpacking_of_standard_unpack_set(TEST_DATA_DIR / 'jffs2_be.img', additional_prefix_folder='jffs-root')
 
     def test_extraction_big(self):
-        self.check_unpacking_of_standard_unpack_set(TEST_DATA_DIR / 'jffs2_le.img', additional_prefix_folder='jffs-root/fs_1')
+        self.check_unpacking_of_standard_unpack_set(TEST_DATA_DIR / 'jffs2_le.img', additional_prefix_folder='jffs-root')