From d731628d037d0bac4ecf17bbe1c5b8dccf3566f5 Mon Sep 17 00:00:00 2001 From: Gedare Bloom Date: Fri, 4 Nov 2022 13:27:16 -0600 Subject: spec/build: split UUID sources from librtemscpu --- spec/build/cpukit/librtemscpu.yml | 15 ++------------- spec/build/cpukit/objbsd.yml | 7 +------ spec/build/cpukit/objuuid.yml | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 spec/build/cpukit/objuuid.yml diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml index c2c8e30a32..d12eae73f4 100644 --- a/spec/build/cpukit/librtemscpu.yml +++ b/spec/build/cpukit/librtemscpu.yml @@ -420,9 +420,6 @@ install: - destination: ${BSP_INCLUDEDIR}/rtems/trace source: - cpukit/include/rtems/trace/rtems-trace-buffer-vars.h -- destination: ${BSP_INCLUDEDIR}/uuid - source: - - cpukit/include/uuid/uuid.h install-path: ${BSP_LIBDIR} links: - role: build-dependency @@ -485,6 +482,8 @@ links: uid: objsmp - role: build-dependency uid: objutf8 +- role: build-dependency + uid: objuuid - role: build-dependency uid: vckey source: @@ -905,16 +904,6 @@ source: - cpukit/libmisc/untar/untar.c - cpukit/libmisc/untar/untar_tgz.c - cpukit/libmisc/untar/untar_txz.c -- cpukit/libmisc/uuid/clear.c -- cpukit/libmisc/uuid/compare.c -- cpukit/libmisc/uuid/copy.c -- cpukit/libmisc/uuid/gen_uuid.c -- cpukit/libmisc/uuid/isnull.c -- cpukit/libmisc/uuid/pack.c -- cpukit/libmisc/uuid/parse.c -- cpukit/libmisc/uuid/unpack.c -- cpukit/libmisc/uuid/unparse.c -- cpukit/libmisc/uuid/uuid_time.c - cpukit/libmisc/xz/xz_crc32.c - cpukit/libmisc/xz/xz_dec_lzma2.c - cpukit/libmisc/xz/xz_dec_stream.c diff --git a/spec/build/cpukit/objbsd.yml b/spec/build/cpukit/objbsd.yml index ba5be69475..7d40325780 100644 --- a/spec/build/cpukit/objbsd.yml +++ b/spec/build/cpukit/objbsd.yml @@ -6,9 +6,7 @@ copyrights: cppflags: [] cxxflags: [] third-party: - extra-files: - - cpukit/libmisc/uuid/uuidP.h - - cpukit/libmisc/uuid/uuidd.h + extra-files: [] enabled-by: true includes: [] install: @@ -54,9 +52,6 @@ install: - cpukit/include/sys/timetc.h - cpukit/include/sys/timex.h - cpukit/include/sys/utsname.h -- destination: ${BSP_INCLUDEDIR}/uuid - source: - - cpukit/include/uuid/uuid.h links: [] source: - cpukit/libcrypt/crypt-md5.c diff --git a/spec/build/cpukit/objuuid.yml b/spec/build/cpukit/objuuid.yml new file mode 100644 index 0000000000..30d5bfa797 --- /dev/null +++ b/spec/build/cpukit/objuuid.yml @@ -0,0 +1,30 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +build-type: objects +cflags: [] +copyrights: +- Copyright (C) 2022 Gedare Bloom +cppflags: [] +cxxflags: [] +third-party: + extra-files: + - cpukit/libmisc/uuid/uuidP.h + - cpukit/libmisc/uuid/uuidd.h +enabled-by: true +includes: [] +install: +- destination: ${BSP_INCLUDEDIR}/uuid + source: + - cpukit/include/uuid/uuid.h +links: [] +source: +- cpukit/libmisc/uuid/clear.c +- cpukit/libmisc/uuid/compare.c +- cpukit/libmisc/uuid/copy.c +- cpukit/libmisc/uuid/gen_uuid.c +- cpukit/libmisc/uuid/isnull.c +- cpukit/libmisc/uuid/pack.c +- cpukit/libmisc/uuid/parse.c +- cpukit/libmisc/uuid/unpack.c +- cpukit/libmisc/uuid/unparse.c +- cpukit/libmisc/uuid/uuid_time.c +type: build -- cgit v1.2.3