From 56861b44878a4488b5c4e414041fd8c0fe2b3342 Mon Sep 17 00:00:00 2001 From: poorndm Date: Mon, 19 Aug 2024 19:22:33 +0530 Subject: [PATCH 1/4] Fix licence transitive dependency Signed-off-by: poorndm --- config/software/libuuid.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/software/libuuid.rb b/config/software/libuuid.rb index 8b92ca07b..680b97939 100644 --- a/config/software/libuuid.rb +++ b/config/software/libuuid.rb @@ -21,6 +21,7 @@ license "LGPL-2.1" license_file "COPYING" +skip_transitive_dependency_licensing true source url: "https://www.kernel.org/pub/linux/utils/util-linux/v#{version}/util-linux-#{version}.tar.gz" # We use the version in util-linux, and only build the libuuid subdirectory From 29b2cd23fdbd156bd551b60e7d2a67ccb0d4e50d Mon Sep 17 00:00:00 2001 From: poorndm Date: Wed, 21 Aug 2024 21:51:57 +0530 Subject: [PATCH 2/4] fix libuuid-2.27.1 build failure Signed-off-by: poorndm --- config/software/libuuid.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config/software/libuuid.rb b/config/software/libuuid.rb index 680b97939..5f122dd03 100644 --- a/config/software/libuuid.rb +++ b/config/software/libuuid.rb @@ -38,8 +38,10 @@ build do env = with_standard_compiler_flags(with_embedded_path) - command "./configure --prefix=#{install_dir}/embedded", env: env + command "./configure --prefix=#{install_dir}/embedded --enable-libuuid", env: env - make "-j #{workers}", env: env, cwd: "#{project_dir}/libuuid" - make "-j #{workers} install", env: env, cwd: "#{project_dir}/libuuid" + command "make clean", cwd: "#{project_dir}/util-linux-#{version}/libuuid" + + make "-j #{workers} V=1", env: env, cwd: "#{project_dir}/util-linux-#{version}/libuuid" + make "-j #{workers} install", env: env, cwd: "#{project_dir}/util-linux-#{version}/libuuid" end From c7b1f190634d761f2a94a82bf31eca4dcd9306f2 Mon Sep 17 00:00:00 2001 From: poorndm Date: Thu, 22 Aug 2024 09:56:11 +0530 Subject: [PATCH 3/4] modified dependency to test keydb build Signed-off-by: poorndm --- config/software/keydb.rb | 1 - config/software/libuuid.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/config/software/keydb.rb b/config/software/keydb.rb index 5788c46c8..fe69c4803 100644 --- a/config/software/keydb.rb +++ b/config/software/keydb.rb @@ -22,7 +22,6 @@ dependency "config_guess" dependency "openssl" -dependency "libuuid" dependency "curl" default_version "6.3.4" diff --git a/config/software/libuuid.rb b/config/software/libuuid.rb index 5f122dd03..54a8d8e37 100644 --- a/config/software/libuuid.rb +++ b/config/software/libuuid.rb @@ -21,7 +21,6 @@ license "LGPL-2.1" license_file "COPYING" -skip_transitive_dependency_licensing true source url: "https://www.kernel.org/pub/linux/utils/util-linux/v#{version}/util-linux-#{version}.tar.gz" # We use the version in util-linux, and only build the libuuid subdirectory From 1f2cd86086a158b829d9a2e007966eb30ea2fb6f Mon Sep 17 00:00:00 2001 From: poorndm Date: Thu, 22 Aug 2024 10:02:23 +0530 Subject: [PATCH 4/4] Revert libuuid changes Signed-off-by: poorndm --- config/software/libuuid.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/config/software/libuuid.rb b/config/software/libuuid.rb index 54a8d8e37..8b92ca07b 100644 --- a/config/software/libuuid.rb +++ b/config/software/libuuid.rb @@ -37,10 +37,8 @@ build do env = with_standard_compiler_flags(with_embedded_path) - command "./configure --prefix=#{install_dir}/embedded --enable-libuuid", env: env + command "./configure --prefix=#{install_dir}/embedded", env: env - command "make clean", cwd: "#{project_dir}/util-linux-#{version}/libuuid" - - make "-j #{workers} V=1", env: env, cwd: "#{project_dir}/util-linux-#{version}/libuuid" - make "-j #{workers} install", env: env, cwd: "#{project_dir}/util-linux-#{version}/libuuid" + make "-j #{workers}", env: env, cwd: "#{project_dir}/libuuid" + make "-j #{workers} install", env: env, cwd: "#{project_dir}/libuuid" end