forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

qemu-*: remove "USB" Internet hack, disable dhcpcd (!1029)

Browse source 
QEMU has its own DHCP server, which provides the necessary routes
and DNS server to access THE INTERNET. Trying to make QEMU provide
something similar to our usual USB network (by starting our our DHCP
server) will just confuse everything and break Internet access in most
cases.

Remove all our custom setup and let QEMU handle all the hard work.
This commit is contained in:
Minecrell 2020-03-06 11:49:01 +01:00 committed by Oliver Smith
parent 97f3533128
commit 6bfe39d804
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
device/device-qemu-aarch64/APKBUILD
View file

@ -57,5 +57,5 @@ kernel_mainline() {
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
} }
sha512sums="f05fd13f5c6e6e5c7d10fd51f044dda122ce65072f4edc7123a042355363973fcae22e4e9caf08a42c4dcd340f196835000147f56b18ebcbc81e038bf4c4eb92 deviceinfo sha512sums="5e9fce6d4dd0e46f2ee63f8440f175cecf2baff62f437e6ff82dd086f5209e3f2dcbf4f6def01ce77e6033d22b4063faa6c551405a16832bf09f8155a1b0d50c deviceinfo
de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25 weston.ini" de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25 weston.ini"

1
device/device-qemu-aarch64/deviceinfo
View file

@ -13,6 +13,7 @@ deviceinfo_flash_method="none"
deviceinfo_generate_legacy_uboot_initfs="false" deviceinfo_generate_legacy_uboot_initfs="false"
deviceinfo_arch="aarch64" deviceinfo_arch="aarch64"
deviceinfo_kernel_cmdline="console=ttyAMA0,38400n8 console=tty1 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE" deviceinfo_kernel_cmdline="console=ttyAMA0,38400n8 console=tty1 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
deviceinfo_disable_dhcpd="true"
# Splash # Splash
deviceinfo_screen_width="640" deviceinfo_screen_width="640"

9
device/device-qemu-amd64/APKBUILD
View file

@ -19,7 +19,7 @@ subpackages="
$pkgname-kernel-mainline:kernel_mainline $pkgname-kernel-mainline:kernel_mainline
" "
source="deviceinfo weston.ini usb_internet.start" source="deviceinfo weston.ini"
options="!check !archcheck" options="!check !archcheck"
build() { build() {
@ -28,8 +28,6 @@ build() {
package() { package() {
devicepkg_package $startdir $pkgname devicepkg_package $startdir $pkgname
install -Dm755 "$srcdir"/usb_internet.start \
"$pkgdir"/etc/local.d/usb_internet.start
} }
x11() { x11() {
@ -74,6 +72,5 @@ kernel_mainline() {
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
} }
sha512sums="acf3e8bb68f7aa56241551ad6224500941c4b2453217a834cd49a5ee1cde2890cc3988eddb155b9e580b09a937fbe2ac3d495fcef5919b6459a1f75041fec000 deviceinfo sha512sums="d7c3a12f38e34b409a8b3767122ceb6803c64014e61c7211e7987274353bf47a9262318e633679861fec203cf717907ab1a1b14668fb81a2a8b6461a1bcaeea1 deviceinfo
47b27c7572b8737988488f7eb23b9e68f9a944e22baafe1c78355d2514a2554cf41d99b29fca12238eb13a6f5d53f00ca89b94e534e8461ebab72256dcf0f142 weston.ini 47b27c7572b8737988488f7eb23b9e68f9a944e22baafe1c78355d2514a2554cf41d99b29fca12238eb13a6f5d53f00ca89b94e534e8461ebab72256dcf0f142 weston.ini"
65468ac81c77637959f2679f8c13e4d82a2056b3b6b17f8e8904fe44e1064d13693e7f8fd43a54fa5e9c09dc966ec47dc5dd492a241cb825fcac6c0a17bb166f usb_internet.start"

1
device/device-qemu-amd64/deviceinfo
View file

@ -13,6 +13,7 @@ deviceinfo_flash_method="none"
deviceinfo_generate_legacy_uboot_initfs="false" deviceinfo_generate_legacy_uboot_initfs="false"
deviceinfo_arch="x86_64" deviceinfo_arch="x86_64"
deviceinfo_kernel_cmdline="console=tty1 console=ttyS0 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE" deviceinfo_kernel_cmdline="console=tty1 console=ttyS0 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
deviceinfo_disable_dhcpd="true"
# Splash # Splash
deviceinfo_screen_width="640" deviceinfo_screen_width="640"

3
device/device-qemu-amd64/usb_internet.start
View file

@ -1,3 +0,0 @@
#!/bin/sh
route add default gw 172.16.42.2