Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General improvements #1492

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

General improvements #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
116506d
bootloaders: load the CML SINIT ACM
jandryuk Dec 13, 2021
0e52d09
openssh: Only use ed25519 sshd host key for argo
jandryuk Feb 28, 2022
1d65bb8
monit: dom0 listen to 127.0.0.1
jandryuk Oct 22, 2021
038cc3d
argo-module: Add argo-module-udev subpackage
jandryuk Aug 30, 2021
c09bc0e
libargo: RDEPENDS on argo-module
jandryuk Aug 30, 2021
99b2653
syncvm-tweaks: Switch to using dbd-tools-guest
jandryuk Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions recipes-connectivity/openssh/files/sshd_config_argo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ Protocol 2
# HostKey for protocol version 1
#HostKey /etc/ssh/ssh_host_key
# HostKeys for protocol version 2
HostKey /etc/ssh/ssh_host_rsa_key_argo
HostKey /etc/ssh/ssh_host_dsa_key_argo
HostKey /etc/ssh/ssh_host_ed25519_key_argo

# Lifetime and size of ephemeral version 1 server key
#KeyRegenerationInterval 1h
Expand Down
7 changes: 2 additions & 5 deletions recipes-connectivity/openssh/openssh_8.%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@ do_install_append() {
install -m 0644 ${WORKDIR}/sshd_config_argo ${D}${sysconfdir}/ssh/sshd_config_argo

install -m 0644 ${WORKDIR}/sshd_config_argo ${D}${sysconfdir}/ssh/sshd_config_readonly_argo
sed -i -e '/HostKey/d' ${D}${sysconfdir}/ssh/sshd_config_readonly_argo
echo "HostKey /var/run/ssh/ssh_host_rsa_key_argo" >> ${D}${sysconfdir}/ssh/sshd_config_readonly_argo
echo "HostKey /var/run/ssh/ssh_host_dsa_key_argo" >> ${D}${sysconfdir}/ssh/sshd_config_readonly_argo
echo "HostKey /var/run/ssh/ssh_host_ecdsa_key_argo" >> ${D}${sysconfdir}/ssh/sshd_config_readonly_argo
echo "HostKey /var/run/ssh/ssh_host_ed25519_key_argo" >> ${D}${sysconfdir}/ssh/sshd_config_readonly_argo
sed -i -e 's|^HostKey /etc/ssh/|HostKey /var/run/ssh/|' \
${D}${sysconfdir}/ssh/sshd_config_readonly_argo

install -m 0644 ${WORKDIR}/volatiles.99_ssh-keygen ${D}${sysconfdir}/default/volatiles/99_ssh-keygen

Expand Down
1 change: 0 additions & 1 deletion recipes-core/images/usbvm-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ IMAGE_INSTALL += " \
openssh \
rsyslog \
usbutils \
argo-module \
grub-xen-conf \
kernel-modules \
vusb-daemon-stub \
Expand Down
1 change: 0 additions & 1 deletion recipes-core/images/xenclient-dom0-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ IMAGE_INSTALL += "\
packagegroup-xenclient-common \
packagegroup-xenclient-dom0 \
packagegroup-openxt-test \
argo-module \
txt-info-module \
xenclient-preload-hs-libs \
linux-firmware-i915 \
Expand Down
1 change: 0 additions & 1 deletion recipes-core/images/xenclient-ndvm-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ IMAGE_INSTALL = " \
linux-firmware-bnx2 \
xenclient-ndvm-tweaks \
rsyslog \
argo-module \
xen-tools-libxenstore \
xen-tools-xenstore \
wget \
Expand Down
1 change: 0 additions & 1 deletion recipes-core/images/xenclient-stubdomain-initramfs-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ IMAGE_INSTALL = " \
initramfs-stubdomain \
xen-tools-xenstore \
qemu-dm-stubdom \
argo-module \
"
IMAGE_LINGUAS = ""

Expand Down
1 change: 0 additions & 1 deletion recipes-core/images/xenclient-syncvm-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ IMAGE_INSTALL = "\
packagegroup-base \
packagegroup-xenclient-common \
kernel-modules \
argo-module \
libargo \
libargo-bin \
rsyslog \
Expand Down
1 change: 0 additions & 1 deletion recipes-core/images/xenclient-uivm-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ IMAGE_INSTALL += "\
openssh \
packagegroup-base \
kernel-modules \
argo-module \
libargo \
libargo-bin \
xinit \
Expand Down
4 changes: 4 additions & 0 deletions recipes-extended/monit/monit/dom0-cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ set statefile /var/lib/monit/state
set eventqueue
basedir /var/lib/monit/events
slots 100

set httpd port 2812 and
use address 127.0.0.1
allow 127.0.0.1
18 changes: 18 additions & 0 deletions recipes-openxt/argo/argo-module_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,31 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b"

require argo.inc
SRC_URI += " \
file://60-argo.rules \
"

S = "${WORKDIR}/git/argo-linux"

inherit module
inherit module-signing
inherit useradd

EXTRA_OEMAKE += "INSTALL_HDR_PATH=${D}${prefix}"
MODULES_INSTALL_TARGET += "headers_install"

KERNEL_MODULE_AUTOLOAD += "xen-argo"

RRECOMMENDS_${PN} = "${PN}-udev"
PACKAGE_BEFORE_PN += "${PN}-udev"
FILES_${PN}-udev = " \
${sysconfdir}/udev/rules.d/ \
"

USERADD_PACKAGES = "${PN}-udev"
GROUPADD_PARAM_${PN}-udev = "-r argo"

do_install_append() {
install -d ${D}${sysconfdir}/udev/rules.d
install -m 0644 ${WORKDIR}/60-argo.rules ${D}${sysconfdir}/udev/rules.d/
}
2 changes: 2 additions & 0 deletions recipes-openxt/argo/files/60-argo.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
KERNEL=="argo_stream", MODE="0660", GROUP="argo"
KERNEL=="argo_dgram", MODE="0660", GROUP="argo"
2 changes: 2 additions & 0 deletions recipes-openxt/argo/libargo_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ S = "${WORKDIR}/git/libargo"
inherit autotools-brokensep pkgconfig lib_package

EXTRA_OECONF += "--with-pic"

RDEPENDS_${PN} += "argo-module"
7 changes: 7 additions & 0 deletions recipes-openxt/xenclient-dom0-tweaks/xenclient-dom0-tweaks/grub.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ menuentry "XenClient: Normal" {
module /boot/6th_gen_i5_i7_SINIT_71.BIN
module /boot/7th_gen_i5_i7-SINIT_74.bin
module /boot/8th_gen_i5_i7-SINIT_76.bin
module /boot/7th_8th_gen_i5_i7-SINIT_81.bin
# This module should remain here or Xen's command line has to be updated with ucode=<index> (currently ucode=-2)
module /boot/microcode_intel.bin
# not ELF - causes module alignment problems
Expand All @@ -79,6 +80,7 @@ menuentry "XenClient Technical Support Option: Safe graphics" {
module /boot/6th_gen_i5_i7_SINIT_71.BIN
module /boot/7th_gen_i5_i7-SINIT_74.bin
module /boot/8th_gen_i5_i7-SINIT_76.bin
module /boot/7th_8th_gen_i5_i7-SINIT_81.bin
module /boot/microcode_intel.bin
module /etc/xen/xenrefpolicy/policy/policy.24
}
Expand All @@ -102,6 +104,7 @@ menuentry "XenClient Technical Support Option: Safe Mode (no autostart of VMs)"
module /boot/6th_gen_i5_i7_SINIT_71.BIN
module /boot/7th_gen_i5_i7-SINIT_74.bin
module /boot/8th_gen_i5_i7-SINIT_76.bin
module /boot/7th_8th_gen_i5_i7-SINIT_81.bin
module /boot/microcode_intel.bin
module /etc/xen/xenrefpolicy/policy/policy.24
}
Expand All @@ -126,6 +129,7 @@ menuentry "XenClient Technical Support Option: Safe Mode with AMT serial" {
module /boot/6th_gen_i5_i7_SINIT_71.BIN
module /boot/7th_gen_i5_i7-SINIT_74.bin
module /boot/8th_gen_i5_i7-SINIT_76.bin
module /boot/7th_8th_gen_i5_i7-SINIT_81.bin
module /boot/microcode_intel.bin
module /etc/xen/xenrefpolicy/policy/policy.24
}
Expand All @@ -150,6 +154,7 @@ menuentry "XenClient Technical Support Option: Normal Mode with synchronised con
module /boot/6th_gen_i5_i7_SINIT_71.BIN
module /boot/7th_gen_i5_i7-SINIT_74.bin
module /boot/8th_gen_i5_i7-SINIT_76.bin
module /boot/7th_8th_gen_i5_i7-SINIT_81.bin
module /boot/microcode_intel.bin
module /etc/xen/xenrefpolicy/policy/policy.24
}
Expand All @@ -174,6 +179,7 @@ menuentry "XenClient Technical Support Option: console access" {
module /boot/6th_gen_i5_i7_SINIT_71.BIN
module /boot/7th_gen_i5_i7-SINIT_74.bin
module /boot/8th_gen_i5_i7-SINIT_76.bin
module /boot/7th_8th_gen_i5_i7-SINIT_81.bin
module /boot/microcode_intel.bin
module /etc/xen/xenrefpolicy/policy/policy.24
}
Expand All @@ -198,6 +204,7 @@ menuentry "XenClient Technical Support Option: console access with AMT serial" {
module /boot/6th_gen_i5_i7_SINIT_71.BIN
module /boot/7th_gen_i5_i7-SINIT_74.bin
module /boot/8th_gen_i5_i7-SINIT_76.bin
module /boot/7th_8th_gen_i5_i7-SINIT_81.bin
module /boot/microcode_intel.bin
module /etc/xen/xenrefpolicy/policy/policy.24
}
2 changes: 1 addition & 1 deletion recipes-openxt/xenclient-dom0-tweaks/xenclient-dom0-tweaks/openxt.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[global]
default=openxt-normal
tboot=tboot min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory
sinit=GM45_GS45_PM45_SINIT_51.BIN Q35_SINIT_51.BIN Q45_Q43_SINIT_51.BIN i5_i7_DUAL_SINIT_51.BIN i7_QUAD_SINIT_51.BIN 3rd_gen_i5_i7_SINIT_67.BIN Xeon-5600-3500-SINIT-v1.1.bin Xeon-E7-8800-4800-2800-SINIT-v1.1.bin 4th_gen_i5_i7_SINIT_75.BIN 5th_gen_i5_i7_SINIT_79.BIN 6th_gen_i5_i7_SINIT_71.BIN 7th_gen_i5_i7-SINIT_74.bin 8th_gen_i5_i7-SINIT_76.bin
sinit=GM45_GS45_PM45_SINIT_51.BIN Q35_SINIT_51.BIN Q45_Q43_SINIT_51.BIN i5_i7_DUAL_SINIT_51.BIN i7_QUAD_SINIT_51.BIN 3rd_gen_i5_i7_SINIT_67.BIN Xeon-5600-3500-SINIT-v1.1.bin Xeon-E7-8800-4800-2800-SINIT-v1.1.bin 4th_gen_i5_i7_SINIT_75.BIN 5th_gen_i5_i7_SINIT_79.BIN 6th_gen_i5_i7_SINIT_71.BIN 7th_gen_i5_i7-SINIT_74.bin 8th_gen_i5_i7-SINIT_76.bin 7th_8th_gen_i5_i7-SINIT_81.bin
ucode=microcode_intel.bin

[openxt-normal]
Expand Down
18 changes: 5 additions & 13 deletions recipes-openxt/xenclient-syncvm-tweaks/xenclient-syncvm-tweaks-1.0/network-config.initscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,21 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#

domstore_read()
{
LD_PRELOAD=/usr/lib/libargo-1.0.so.0 \
DBUS_SYSTEM_BUS_ADDRESS=tcp:host=1.0.0.0,port=5556 \
INET_IS_ARGO=1 \
db-read "$@"
}

if [ "$(domstore_read network/mode)" = "static" ] ; then
if [ "$(db-read-dom0 network/mode)" = "static" ] ; then

cat <<EOF > /var/volatile/etc/network/interfaces
auto lo
iface lo inet loopback

auto eth0
iface eth0 inet static
address $(domstore_read network/address)
netmask $(domstore_read network/netmask)
gateway $(domstore_read network/gateway)
address $(db-read-dom0 network/address)
netmask $(db-read-dom0 network/netmask)
gateway $(db-read-dom0 network/gateway)
EOF

cat <<EOF > /etc/resolv.conf
nameserver $(domstore_read network/dns)
nameserver $(db-read-dom0 network/dns)
EOF

else
Expand Down
2 changes: 1 addition & 1 deletion recipes-openxt/xenclient-syncvm-tweaks/xenclient-syncvm-tweaks_1.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SRC_URI = "file://argo.modutils \

PACKAGES = "${PN}"

RDEPENDS_${PN} += "dbd-tools"
RDEPENDS_${PN} += "dbd-tools-guest"

FILES_${PN} = "/"

Expand Down