Skip to content

Commit bc89639

Browse files
committed
Merge branch '3.0-dev' into 3.0
Merge branch '3.0-dev' commit 45b19eb Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
2 parents ba59169 + 45b19eb commit bc89639

40 files changed

+362
-2258
lines changed

.github/workflows/zizmor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
name: GitHub Actions Security Analysis with zizmor 🌈
55

66
on:
7-
push:
8-
branches: [3.0, 3.0-dev]
97
pull_request:
108
branches: [3.0, 3.0-dev]
119

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
@@ -2254,6 +2254,7 @@
22542254
"license": "[MIT License](/LICENSES-AND-NOTICES/LICENSE.md)",
22552255
"specs": [
22562256
"cluster-agent",
2257+
"device-discovery",
22572258
"edge-release",
22582259
"edge-repos",
22592260
"edge-rpm-macros",
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[Unit]
2+
Description=Device Discovery Agent
3+
Documentation=https://github.com/open-edge-platform/infra-onboarding
4+
After=network.target
5+
6+
[Service]
7+
Type=oneshot
8+
ExecStart=/usr/bin/device-discovery/device-discovery
9+
StandardOutput=journal
10+
StandardError=journal
11+
TimeoutSec=0
12+
RemainAfterExit=yes
13+
14+
[Install]
15+
WantedBy=multi-user.target
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"Signatures": {
3+
"device-discovery-1.17.2-emt-uos.tar.gz": "658de2cbc2da7a4297dcbf021221f5094618afd7ffa0a190082329470ece91c1",
4+
"device-discovery-1.17.2-vendor.tar.gz": "997e40026d04be283d65dbe202a5ffe23b49cb42311a769b2910d4a2a7919a09",
5+
"device-discovery.service": "ddf6a09482470231124d5dfd1375ab7b7a57c83e3e7a98a11fd6957ff2e5df96"
6+
}
7+
}
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
%global infraonboarding_gitpath github.com/open-edge-platform/infra-onboarding
2+
3+
Summary: Device Discovery Agent for Edge Node
4+
Name: device-discovery
5+
Version: 1.17.2
6+
Release: 2%{?dist}
7+
Distribution: Edge Microvisor Toolkit
8+
Vendor: Intel Corporation
9+
License: Apache-2.0
10+
URL: https://github.com/open-edge-platform/infra-onboarding/tree/main/hook-os/device_discovery
11+
Source0: https://%{infraonboarding_gitpath}/archive/refs/tags/emt-uos.tar.gz#/%{name}-%{version}-emt-uos.tar.gz
12+
Source1: device-discovery.service
13+
Source2: device-discovery-%{version}-vendor.tar.gz
14+
15+
%{?systemd_requires}
16+
17+
BuildRequires: golang >= 1.23
18+
BuildRequires: systemd-rpm-macros
19+
Requires: curl
20+
Requires: dmidecode
21+
22+
%description
23+
The Device Discovery Agent for Edge Node in order to retrieve the specific configuration to start for the current/correct machine.
24+
25+
26+
%prep
27+
%setup -q -n infra-onboarding-emt-uos
28+
cd hook-os/device_discovery
29+
tar -xzf %{SOURCE2} -C .
30+
31+
%build
32+
cd hook-os/device_discovery
33+
CGO_ENABLED=0 go build -buildmode=pie -mod=vendor -trimpath -ldflags '-extldflags "-static"' -gcflags=all="-l -B" -o device-discovery
34+
35+
%install
36+
install -d -m 0755 %{buildroot}%{_bindir}/device-discovery
37+
install -m 0755 ./hook-os/device_discovery/device-discovery %{buildroot}%{_bindir}/device-discovery/device-discovery
38+
install -m 0755 ./hook-os/device_discovery/client-auth.sh %{buildroot}%{_bindir}/device-discovery/client-auth.sh
39+
40+
# systemd units
41+
install -Dp -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/device-discovery.service
42+
43+
%post
44+
%systemd_post device-discovery.service
45+
46+
%files
47+
%{_bindir}/device-discovery/*
48+
%{_unitdir}/device-discovery.service
49+
50+
%changelog
51+
* Fri May 30 2025 Anuj Mittal <anuj.mittal@intel.com> - 1.17.2-2
52+
- Update the source directory name
53+
54+
* Tue May 20 2025 Andy <andy.peng@intel.com> - 1.17.2-1
55+
- Original version for Edge Microvisor Toolkit. License verified.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"lts-v6.12.28-emt-250519T192106Z.tar.gz": "12013d6e11dd8a87695da88dc3af6e3afb908382147506b13b5c54184824a599"
3+
"lts-v6.12.30-emt-250524T131939Z.tar.gz": "4e01b71ed55e65db08828a9c1974fa5723714808c25e1aa2b7c03c4c3ff04178"
44
}
55
}

SPECS/kernel-headers/kernel-headers.spec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
Summary: Linux API header files
1515
Name: kernel-headers
16-
Version: 6.12.28
16+
Version: 6.12.30
1717
Release: 1%{?dist}
1818
License: GPLv2
1919
Vendor: Intel Corporation
2020
Distribution: Edge Microvisor Toolkit
2121
Group: System Environment/Kernel
2222
URL: https://github.com/intel/linux-intel-lts
23-
Source0: https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.28-emt-250519T192106Z.tar.gz
23+
Source0: https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.30-emt-250524T131939Z.tar.gz
2424
# Historical name shipped by other distros
2525
Provides: glibc-kernheaders = %{version}-%{release}
2626
BuildArch: noarch
@@ -41,7 +41,7 @@ cross-glibc package.
4141
%endif
4242

4343
%prep
44-
%setup -q -n lts-v6.12.28-emt-250519T192106Z
44+
%setup -q -n lts-v6.12.30-emt-250524T131939Z
4545

4646
%build
4747
make mrproper
@@ -76,6 +76,9 @@ done
7676
%endif
7777

7878
%changelog
79+
* Wed Mar 28 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.30-1
80+
- Update kernel to 6.12.30
81+
7982
* Thu Mar 22 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.28-1
8083
- Update kernel to 6.12.28
8184

SPECS/kernel-rt/CVE-2025-37821-1.patch

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

0 commit comments

Comments
 (0)