Skip to content

Commit fd2b422

Browse files
anujm1anujm1
authored
Merge branch '3.0-dev' into 3.0-dev
2 parents 216f9d5 + 1e2134e commit fd2b422

26 files changed

+273
-109
lines changed

‎CONTRIBUTION.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Contribution Guide
2+
3+
As an open source project, we are always happy to see community contributions.
4+
To ensure smooth implementation and consistency in how these contributions are made,
5+
check out our [contribution guide: here](./docs/developer-guide/emt-contribution.md).

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES-AND-NOTICES/SPECS/data/licenses.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2280,6 +2280,7 @@
22802280
"platform-update-agent",
22812281
"python-snoop",
22822282
"rpc",
2283+
"tink-worker",
22832284
"tpm-cryptsetup",
22842285
"tpm2-initramfs-tool"
22852286
]

‎SPECS-EXTENDED/intel-cmt-cat/intel-cmt-cat.signatures.json‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎SPECS/dracut/90tmpfsroot/tmpfsroot-mount.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the MIT License.
44

55
info "mount tmpfs for root"
6-
if ! mount -t tmpfs -o size=1G tmpfs $NEWROOT; then
6+
if ! mount -t tmpfs tmpfs $NEWROOT; then
77
warn "Failed to mount tmpfs on $NEWROOT"
88
die
99
fi

‎SPECS/dracut/dracut.signatures.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"lgpl-2.1.txt": "dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551",
1414
"megaraid.conf": "914824cdbe0c525b71efa05a75e453335b0068beb8bc28bef2a5866d74bf7dd4",
1515
"tmpfsroot-module-setup.sh": "d1e2d512a3769fb70f7726b1899f89950d5bfc2199e8cde5df44adebd740006f",
16-
"tmpfsroot-mount.sh": "884c4c9a17118229dfbb40ec9a4a23d307c12349dbf19adc1a2d8640c2f77fd0",
16+
"tmpfsroot-mount.sh": "5fdcac59d2a9560215f91619373fb217592e7c9e51ff74cd21883411ea6ded66",
1717
"module-setup.sh": "8f5a0d3cc393d78bcb523b0d53c578d2767d688f00e84b525355bbb31d753da4",
1818
"overlayfs-mount.sh": "28f47c107a4435c5153bdb5b2f92f20b7a75bf3932216635ee810875c27dd55b"
1919
}

‎SPECS/dracut/dracut.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Summary: dracut to create initramfs
55
Name: dracut
66
Version: 102
7-
Release: 14%{?dist}
7+
Release: 15%{?dist}
88
# The entire source code is GPLv2+
99
# except install/* which is LGPLv2+
1010
License: GPLv2+ AND LGPLv2+
@@ -345,6 +345,9 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}
345345
%dir %{_sharedstatedir}/%{name}/overlay
346346

347347
%changelog
348+
* Fri May 30 2025 Lishan Liu <lishan.liu@intel.com> - 102-15
349+
- Update tmpfs mount command in tmpfsroot-mount.sh
350+
348351
* Thu May 22 2025 Mun Chun Yep <mun.chun.yep@intel.com> - 102-14
349352
- Revert 6d93d4260 to fix tmpfs mount issue.
350353

SPECS-EXTENDED/intel-cmt-cat/0001-alter-install-paths.patch renamed to SPECS/intel-cmt-cat/0001-alter-install-paths.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Index: intel-cmt-cat-24.05/lib/Makefile
1313
PREFIX ?= /usr/local
1414
-LIB_INSTALL_DIR ?= $(PREFIX)/lib
1515
-HDR_DIR ?= $(PREFIX)/include
16-
+LIB_INSTALL_DIR ?= $(DESTDIR)/usr/lib64
16+
+LIB_INSTALL_DIR ?= $(DESTDIR)/usr/lib
1717
+HDR_DIR ?= $(DESTDIR)/usr/include
1818
DEPFILE = $(LIB).dep
1919
-NOLDCONFIG ?= n

SPECS-EXTENDED/intel-cmt-cat/0002-remove-build-and-install-of-examples.patch renamed to SPECS/intel-cmt-cat/0002-remove-build-and-install-of-examples.patch

File renamed without changes.

SPECS-EXTENDED/intel-cmt-cat/0003-allow-debian-flags-to-be-added.patch renamed to SPECS/intel-cmt-cat/0003-allow-debian-flags-to-be-added.patch

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Description: Hard code in hardening options
22
Forwarded: not-needed
33
Author: Colin Ian King <colin.i.king@gmail.com>
44

5-
Index: intel-cmt-cat-24.05/lib/Makefile
5+
Index: intel-cmt-cat-25.04/lib/Makefile
66
===================================================================
7-
--- intel-cmt-cat-24.05.orig/lib/Makefile
8-
+++ intel-cmt-cat-24.05/lib/Makefile
7+
--- intel-cmt-cat-25.04.orig/lib/Makefile
8+
+++ intel-cmt-cat-25.04/lib/Makefile
99
@@ -39,8 +39,8 @@ LIB = libpqos
10-
VERSION = 6.0.0
10+
VERSION = 6.0.1
1111
SO_VERSION = 6
1212
SHARED ?= y
1313
-LDFLAGS = -L. -lpthread -z noexecstack -z relro -z now
@@ -17,10 +17,10 @@ Index: intel-cmt-cat-24.05/lib/Makefile
1717
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
1818
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
1919
-Wcast-qual -Wundef -Wwrite-strings \
20-
Index: intel-cmt-cat-24.05/pqos/Makefile
20+
Index: intel-cmt-cat-25.04/pqos/Makefile
2121
===================================================================
22-
--- intel-cmt-cat-24.05.orig/pqos/Makefile
23-
+++ intel-cmt-cat-24.05/pqos/Makefile
22+
--- intel-cmt-cat-25.04.orig/pqos/Makefile
23+
+++ intel-cmt-cat-25.04/pqos/Makefile
2424
@@ -38,9 +38,9 @@ include ../pre-build.mk
2525

2626
OBJDIR = obj
@@ -33,10 +33,10 @@ Index: intel-cmt-cat-24.05/pqos/Makefile
3333
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
3434
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
3535
-Wcast-qual -Wundef -Wwrite-strings \
36-
Index: intel-cmt-cat-24.05/rdtset/Makefile
36+
Index: intel-cmt-cat-25.04/rdtset/Makefile
3737
===================================================================
38-
--- intel-cmt-cat-24.05.orig/rdtset/Makefile
39-
+++ intel-cmt-cat-24.05/rdtset/Makefile
38+
--- intel-cmt-cat-25.04.orig/rdtset/Makefile
39+
+++ intel-cmt-cat-25.04/rdtset/Makefile
4040
@@ -37,9 +37,9 @@
4141
include ../pre-build.mk
4242

@@ -49,10 +49,10 @@ Index: intel-cmt-cat-24.05/rdtset/Makefile
4949
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
5050
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
5151
-Wcast-qual -Wundef -Wwrite-strings \
52-
Index: intel-cmt-cat-24.05/tools/membw/Makefile
52+
Index: intel-cmt-cat-25.04/tools/membw/Makefile
5353
===================================================================
54-
--- intel-cmt-cat-24.05.orig/tools/membw/Makefile
55-
+++ intel-cmt-cat-24.05/tools/membw/Makefile
54+
--- intel-cmt-cat-25.04.orig/tools/membw/Makefile
55+
+++ intel-cmt-cat-25.04/tools/membw/Makefile
5656
@@ -44,7 +44,7 @@ PREFIX ?= /usr/local
5757
BIN_DIR = $(DESTDIR)/usr/bin
5858
MAN_DIR = $(DESTDIR)/usr/share/man/man8

0 commit comments

Comments
 (0)