introduce nwipe package
PATCH 1/1 introduce nwipe package
From: Charles Duffy <[email protected]>
--- package/Config.in | 1 + package/nwipe/Config.in | 9 +++++++++ package/nwipe/nwipe.mk | 27 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 package/nwipe/Config.in create mode 100644 package/nwipe/nwipe.mk
package/Config.in +1 -0
@@ -1496,6 +1496,7 @@ endif source "package/ncdu/Config.in" source "package/numactl/Config.in" source "package/nut/Config.in" + source "package/nwipe/Config.in" source "package/openvmtools/Config.in" source "package/polkit/Config.in" source "package/powerpc-utils/Config.in"
package/nwipe/Config.in new file +9 -0
@@ -0,0 +1,9 @@ +config BR2_PACKAGE_NWIPE + bool "nwipe" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_NCURSES + help + nwipe thoroughly overwrites block devices, forked from a component at + the core of the venerable DBAN. + + https://github.com/martijnvanbrummelen/nwipe
package/nwipe/nwipe.mk new file +27 -0
@@ -0,0 +1,27 @@ +################################################################################ +# +# nwipe +# +################################################################################ + +NWIPE_VERSION = 0.17 +NWIPE_SITE = https://github.com/martijnvanbrummelen/nwipe +NWIPE_SITE_METHOD = git +NWIPE_DEPENDENCIES = ncurses parted +NWIPE_CONF_OPTS = --bindir=/bin +NWIPE_LICENSE = GPL +NWIPE_LICENSE_FILES = LICENCE + +define NWIPE_RUN_AUTOGEN + cd $(@D) && { printf '%s\n' '44a' 'AC_CHECK_LIB([intl], [libintl_dgettext]) # needed by static builds of libparted' 'AC_CHECK_LIB([uuid], [uuid_generate]) # needed by static builds of libparted' '.' 'w' | edit configure.ac; } + cd $(@D) && PATH=$(BR_PATH) ./init.sh +endef +NWIPE_PRE_CONFIGURE_HOOKS += NWIPE_RUN_AUTOGEN + +# to fix support for MUSL +define NWIPE_USE_OFF64T + cd $(@D) && find . -type f -name '*.[ch]' -exec sed -i -r -e 's/loff_t/off64_t/g' -- '{}' + +endef +NWIPE_PRE_CONFIGURE_HOOKS += NWIPE_USE_OFF64T + +$(eval $(autotools-package))
Signature · 1 line
2.0.0
PATCH 1/1 introduce nwipe package
Dear Charles Duffy,
Thanks for your contribution. See some comments below.
package/nwipe/Config.in line 4
Quoted 10 lines · Charles Duffy
package/nwipe/Config.in new file +4
-0@@ -0,0 +1,9 @@ +config BR2_PACKAGE_NWIPE + bool "nwipe" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_NCURSES
You also need to select parted here if you depend on it, as suggested by your NWIPE_DEPENDENCIES variable below.
Quoted 11 lines
package/nwipe/Config.in new file +5
-0+ help + nwipe thoroughly overwrites block devices, forked from a component at + the core of the venerable DBAN. + + https://github.com/martijnvanbrummelen/nwipepackage/nwipe/nwipe.mk new file +0
-0
package/nwipe/nwipe.mk line 9
Quoted 9 lines
package/nwipe/nwipe.mk new file +9
-0@@ -0,0 +1,27 @@ +################################################################################ +# +# nwipe +# +################################################################################ + +NWIPE_VERSION = 0.17 +NWIPE_SITE = https://github.com/martijnvanbrummelen/nwipe +NWIPE_SITE_METHOD = git
Use the github helper function instead. This way, you can remove the NWIPE_SITE_METHOD variable and simply do:
NWIPE_SITE = $(call github,martijnvanbrummelen,nwipe,$(NWIPE_VERSION))
package/nwipe/nwipe.mk line 11
Quoted 2 lines
package/nwipe/nwipe.mk new file +2
-0+NWIPE_DEPENDENCIES = ncurses parted +NWIPE_CONF_OPTS = --bindir=/bin
Why do you need to override --bindir ?
package/nwipe/nwipe.mk line 12
Quoted 1 line
package/nwipe/nwipe.mk new file +1
-0+NWIPE_LICENSE = GPL
You should specify the GPL version. In the case of this program, it's GPLv2.
package/nwipe/nwipe.mk line 13
Quoted 1 line
package/nwipe/nwipe.mk new file +1
-0+NWIPE_LICENSE_FILES = LICENCE
There is no file named 'LICENCE' in the repository. Use COPYING instead.
package/nwipe/nwipe.mk line 16
Quoted 3 lines
package/nwipe/nwipe.mk new file +3
-0+ +define NWIPE_RUN_AUTOGEN + cd $(@D) && { printf '%s\n' '44a' 'AC_CHECK_LIB([intl], [libintl_dgettext]) # needed by static builds of libparted' 'AC_CHECK_LIB([uuid], [uuid_generate]) # needed by static builds of libparted' '.' 'w' | edit configure.ac; }
Ouch, this is not pretty. What are you trying to do here exactly ? Could you instead do a patch ?
package/nwipe/nwipe.mk line 17
Quoted 1 line
package/nwipe/nwipe.mk new file +1
-0+ cd $(@D) && PATH=$(BR_PATH) ./init.sh
Please use:
NWIPE_AUTORECONF = YES
instead. Your solution doesn't work because you do not have the guarantee that autoconf/automake/libtool will be available, while <pkg>_AUTORECONF = YES ensures that all the necessary dependencies will be available.
package/nwipe/nwipe.mk line 23
Quoted 6 lines
package/nwipe/nwipe.mk new file +6
-0+endef +NWIPE_PRE_CONFIGURE_HOOKS += NWIPE_RUN_AUTOGEN + +# to fix support for MUSL +define NWIPE_USE_OFF64T + cd $(@D) && find . -type f -name '*.[ch]' -exec sed -i -r -e 's/loff_t/off64_t/g' -- '{}' +
Same, could you do a patch instead, and submit it upstream? github makes it very easy to submit pull requests to the projects. I see you already submitted an issue
(https://github.com/martijnvanbrummelen/nwipe/issues/11), but maybe a pull request with a patch would help?
Regarding https://github.com/martijnvanbrummelen/nwipe/issues/12 (i.e missing intl and uuid), I think the proper solution is not your patch, but instead to use pkg-config to detect parted. I.e, replace:
AC_CHECK_LIB([parted], [ped_device_probe_all], ,[AC_MSG_ERROR([parted development library not found])])
by something like:
PKG_CHECK_MODULES([PARTED], [libparted])
Also, I see that the configure.ac already uses PKG_CHECK_MODULES() for other libraries, so you should add host-pkgconf in NWIPE_DEPENDENCIES.
Finally, please add a nwipe.hash file that contains the sha256 hash of the downloaded tarball (yes, when you use the github helper function as suggested above, it's really a tarball that gets downloaded over HTTP, and not a Git clone that gets done).
Could you submit an updated version of your patch that takes into account those comments?
Thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com