|
[-]
[+]
|
Changed |
_service:gitpkg:sdk-setup.tgz/src/mb2
|
| @@ -189,6 +189,10 @@
target="$1"; shift
[[ -d ~/.scratchbox2/$target ]] || fatal "$target is an invalid sb2 target"
;;
+ "-d" | "--device") shift
+ device="$1"; shift
+ get_device $device < $DEVICES_XML
+ ;;
"-p" | "--projectdir") shift
projdir="$1"; shift
pkgdir=$projdir/rpm
|
|
[-]
[+]
|
Changed |
_service:gitpkg:sdk-setup.tgz/src/sdk-setup-enginelan
^
|
| @@ -4,6 +4,7 @@
#
# It is run by systemd once the configuration shared folder is mounted and it then sets
# up the ethernet for connman; connman will immediately reconfigure the 2nd adapter
+DEVICES_XML=/etc/mersdk/share/devices.xml
read_dom () {
local IFS=\>
@@ -40,8 +41,9 @@
return 1
}
-if get_engine; then
+if get_engine < $DEVICES_XML ; then
echo "Setting up SDK Engine internal LAN to $subnet.254"
+ MAC2=$(cat /sys/class/net/eth?/address | grep -iv 08:00:5A:11:F1:55)
cat <<EOF > /var/lib/connman/sdkengine.config
[global]
Name = SDK Engine
@@ -49,10 +51,16 @@
[service_sailfishsdk_ethernet]
Type = ethernet
-IPv4 = $subnet.254/24/$subnet.254
+IPv4 = $subnet.254/24/0.0.0.0
IPv6 = off
MAC = 08:00:5A:11:F1:55
+[service_nat_ethernet]
+Type = ethernet
+IPv4 = dhcp
+IPv6 = off
+MAC = $MAC2
+
EOF
exit 0
else
|
|
[-]
[+]
|
Deleted |
_service:gitpkg:sdk-setup.tgz/systemd/default.target
^
|
| -(symlink to /lib/systemd/system/multi-user.target)
|
|
[-]
[+]
|
Changed |
_service:gitpkg:sdk-setup.tgz/systemd/etc-mersdk-share.mount
^
|
| @@ -1,13 +1,13 @@
[Unit]
Description=Build Engine/QtCreator shared configuration
-Before=sshd.service sdk-webapp.service
-RequiredBy=sshd.service
+Before=sdk-webapp.service
[Mount]
What=config
Where=/etc/mersdk/share
Type=vboxsf
-Options=rw,exec,uid=0,gid=0,dev,fmode=555,dmode=555
+# This folder will contain private keys so we need to be 700, 700
+Options=rw,exec,uid=1001,gid=1001,dev,fmode=700,dmode=700
DirectoryMode=755
TimeoutSec=10
|
|
[-]
[+]
|
Changed |
_service:gitpkg:sdk-setup.tgz/systemd/information.service
^
|
| @@ -4,7 +4,6 @@
[Unit]
Description=SDK Information
Documentation=http://wiki.merproject.org/Platform_SDK
-WantedBy=multi-user.target
After=systemd-user-sessions.service plymouth-quit-wait.service multi-user.target network.target
[Service]
@@ -15,3 +14,6 @@
StandardInput=tty-force
StandardOutput=tty-force
StandardError=inherit
+
+[Install]
+WantedBy=multi-user.target
|
|
[-]
[+]
|
Changed |
_service:gitpkg:sdk-setup.tgz/systemd/sdk-enginelan.service
^
|
| @@ -4,8 +4,10 @@
[Unit]
Description=SDK Engine LAN
Documentation=https://wiki.merproject.org/wiki/SDK_on_VirtualBox/Design
-WantedBy=multi-user.target
-After=etc-mersdk-share.mount connman.service
+# We need the shared mount and we should setup before connman so there's
+# no confusion about MACs
+After=etc-mersdk-share.mount
+Before=connman.service
[Service]
Type=oneshot
@@ -13,3 +15,5 @@
WorkingDirectory=/root
ExecStart=/usr/bin/sdk-setup-enginelan
+[Install]
+WantedBy=multi-user.target
|
