diff --git a/cbox-tree.d/usr/lib/cryptobox/devel-features.sh b/live-cd-tree.d/usr/lib/cryptobox/devel-features.sh similarity index 100% rename from cbox-tree.d/usr/lib/cryptobox/devel-features.sh rename to live-cd-tree.d/usr/lib/cryptobox/devel-features.sh diff --git a/packages/cryptobox_0.3.0-1_all.deb b/packages/cryptobox_0.3.0-1_all.deb deleted file mode 100644 index dd7a602..0000000 Binary files a/packages/cryptobox_0.3.0-1_all.deb and /dev/null differ diff --git a/scripts/cbox-build.sh b/scripts/cbox-build.sh index bbb8304..4b54756 100755 --- a/scripts/cbox-build.sh +++ b/scripts/cbox-build.sh @@ -144,6 +144,8 @@ done while [ $# -gt 0 ] do case "$1" in dfsbuild ) + # build the cryptobox package first + "$0" package # check if we are in ROOT_DIR - otherwise we will have problems with # relative paths in dfs-box.conf [ "$ROOT_DIR" -ef "$(pwd)" ] || error_die 1 "Sorry: you have to run $0 while you are in '$ROOT_DIR'!" @@ -161,6 +163,9 @@ while [ $# -gt 0 ] config ) configure_cb normal ;; + package ) + (cd "$ROOT_DIR"; scripts/debian) + ;; iso ) create_uncompressed_iso ;;