From 5364e7ddcd4f9afc8e3758c24d60a26624be96c4 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Mon, 17 Jun 2019 17:02:18 +0200 Subject: [PATCH 1/2] Revert stripping of executable in release mode Was added in 299475fac6c29ff969ecc06a12b2833d92bf2538 to fix some .deb lint warning (lintian), but bitbake doesn't like it. Signed-off-by: Laurent Bonnans --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17514e7e6f..a814362e42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,8 +162,6 @@ if(FAULT_INJECTION) endif(FAULT_INJECTION) # flags for different build types -list(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " -s") - set(CMAKE_CXX_FLAGS_DEBUG "-Og -g") set(CMAKE_C_FLAGS_DEBUG "-Og -g") From 18cb13659daf52f35bed210bd0e147ecc4b8da81 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Mon, 17 Jun 2019 17:59:09 +0200 Subject: [PATCH 2/2] Strip executables in build_ubuntu.sh lintian reports non-stripped executables as warnings Signed-off-by: Laurent Bonnans --- scripts/build_ubuntu.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/build_ubuntu.sh b/scripts/build_ubuntu.sh index 4c49f7b70d..8b6b5f0c13 100755 --- a/scripts/build_ubuntu.sh +++ b/scripts/build_ubuntu.sh @@ -13,7 +13,8 @@ export TEST_WITH_TESTSUITE=0 # build and copy aktualizr.deb and garage_deploy.deb to $TEST_INSTALL_DESTDIR mkdir -p "$TEST_INSTALL_DESTDIR" -"$GITREPO_ROOT/scripts/test.sh" +# note: executables are stripped, following common conventions in .deb packages +LDFLAGS="-s" "$GITREPO_ROOT/scripts/test.sh" # copy provisioning data and scripts cp -rf "$GITREPO_ROOT/tests/test_data/prov_selfupdate" "$TEST_INSTALL_DESTDIR"