[elbe-devel] [PATCH 1/2] debianize: remove barebox tools

[yegorslists at googlemail.com]

From: Yegor Yefremov <yegorslists at googlemail.com>

The tools will be compiled for the host and not the target
hence we cannot install them as they are.

Signed-off-by: Yegor Yefremov <yegorslists at googlemail.com>
---
 elbepack/debianize/panels/barebox.py                       | 2 --
 elbepack/makofiles/debianize/barebox/barebox-tools.install | 1 -
 elbepack/makofiles/debianize/barebox/control.mako          | 6 ------
 elbepack/makofiles/debianize/barebox/rules.mako            | 6 +-----
 4 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 elbepack/makofiles/debianize/barebox/barebox-tools.install

diff --git a/elbepack/debianize/panels/barebox.py b/elbepack/debianize/panels/barebox.py
index 3b83a7118..b175bfeaf 100644
--- a/elbepack/debianize/panels/barebox.py
+++ b/elbepack/debianize/panels/barebox.py
@@ -58,8 +58,6 @@ class BareBox(Panel):
 
         copyfile(os.path.join(self.tmpl_dir, 'barebox-image.install'),
                  'debian/barebox-image-' + pkg_name + '.install')
-        copyfile(os.path.join(self.tmpl_dir, 'barebox-tools.install'),
-                 'debian/barebox-tools-' + pkg_name + '.install')
 
         self.hint = "use 'dpkg-buildpackage -a%s' to build the package" % (
             self.deb['p_arch'])
diff --git a/elbepack/makofiles/debianize/barebox/barebox-tools.install b/elbepack/makofiles/debianize/barebox/barebox-tools.install
deleted file mode 100644
index 94924c6d6..000000000
--- a/elbepack/makofiles/debianize/barebox/barebox-tools.install
+++ /dev/null
@@ -1 +0,0 @@
-./usr/bin/*
diff --git a/elbepack/makofiles/debianize/barebox/control.mako b/elbepack/makofiles/debianize/barebox/control.mako
index 688cc25e6..0f4f04988 100644
--- a/elbepack/makofiles/debianize/barebox/control.mako
+++ b/elbepack/makofiles/debianize/barebox/control.mako
@@ -17,9 +17,3 @@ Provides: barebox-image
 Architecture: ${p_arch}
 Description: Barebox, version ${p_name} ${k_version}
  This package contains barebox
-
-Package: barebox-tools-${p_name}-${k_version}
-Provides: barebox-tools 
-Architecture: ${p_arch}
-Description: Barebox tools 
- This package provides Barebox Userspace tools
diff --git a/elbepack/makofiles/debianize/barebox/rules.mako b/elbepack/makofiles/debianize/barebox/rules.mako
index e9efa0e11..9c055f2ea 100755
--- a/elbepack/makofiles/debianize/barebox/rules.mako
+++ b/elbepack/makofiles/debianize/barebox/rules.mako
@@ -7,12 +7,10 @@
 #!/usr/bin/make -f
 
 BOOT_PATH=`pwd`/debian/tmp/boot
-TOOL_PATH=`pwd`/debian/tmp/usr/bin
 
 MAKE_OPTS= \
 ARCH=${k_arch} \
 CROSS_COMPILE=${cross_compile} \
-KERNELRELEASE=${k_version}-${p_name} \
 O=debian/build
 
 #export DH_VERBOSE=1
@@ -33,10 +31,8 @@ override_dh_auto_build:
 	make -j`nproc` $(MAKE_OPTS)
 
 override_dh_auto_install:
-	mkdir -p $(TOOL_PATH) $(BOOT_PATH)
+	mkdir -p $(BOOT_PATH)
 	cp debian/build/images/${imgname} $(BOOT_PATH)
-	-cp debian/build/scripts/bareboxcrc32-target $(TOOL_PATH)/bareboxcrc32
-	-cp debian/build/scripts/bareboxenv-target $(TOOL_PATH)/bareboxenv
 
 %%:
 	dh $@
-- 
2.17.0