github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 13:37:10 +00:00
Code Issues Projects Releases Wiki Activity

deb-pkg: Delete the folder name of acrn-hypervisor in the configuration file

Browse Source 
When cloning the ACRN source code to a folder, which is not named "acrn-hypervisor",
the debian package created by the "make" call does not contain all needed files.
Because the file ".deb.conf" contains hardcoded folder names which contain the
folder name "acrn-hypervisor".

Tracked-On: #7022

Signed-off-by: Hu Fenglin <fenglin.hu@intel.com>
This commit is contained in:
Hu Fenglin 2022-01-11 22:40:00 +08:00 committed by acrnsi-robot
parent 0b156a79de
commit 1c217588aa
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
.deb.conf
View File

@ -1,138 +1,138 @@
{ {
"acrn.bin":{ "acrn.bin":{
"source":"acrn-hypervisor/build/hypervisor/acrn.bin", "source":"build/hypervisor/acrn.bin",
"target":"boot/" "target":"boot/"
}, },
"acrnctl":{ "acrnctl":{
"source":"acrn-hypervisor/build/misc/services/acrnctl", "source":"build/misc/services/acrnctl",
"target":"usr/bin/" "target":"usr/bin/"
}, },
"acrnd":{ "acrnd":{
"source":"acrn-hypervisor/build/misc/services/acrnd", "source":"build/misc/services/acrnd",
"target":"usr/bin/" "target":"usr/bin/"
}, },
"acrn-dm":{ "acrn-dm":{
"source":"acrn-hypervisor/build/devicemodel/acrn-dm", "source":"build/devicemodel/acrn-dm",
"target":"usr/bin/" "target":"usr/bin/"
}, },
"acrnlog":{ "acrnlog":{
"source":"acrn-hypervisor/build/misc/debug_tools/acrnlog", "source":"build/misc/debug_tools/acrnlog",
"target":"usr/bin/" "target":"usr/bin/"
}, },
"acrnprobe":{ "acrnprobe":{
"source":"acrn-hypervisor/build/misc/debug_tools/acrn-crashlog/acrnprobe/bin/acrnprobe", "source":"build/misc/debug_tools/acrn-crashlog/acrnprobe/bin/acrnprobe",
"target":"usr/bin/" "target":"usr/bin/"
}, },
"acrntrace":{ "acrntrace":{
"source":"acrn-hypervisor/build/misc/debug_tools/acrntrace", "source":"build/misc/debug_tools/acrntrace",
"target":"usr/bin/" "target":"usr/bin/"
}, },
"crashlogctl":{ "crashlogctl":{
"source":"acrn-hypervisor/misc/debug_tools/acrn_crashlog/data/crashlogctl", "source":"misc/debug_tools/acrn_crashlog/data/crashlogctl",
"target":"usr/bin/" "target":"usr/bin/"
}, },
"debugger":{ "debugger":{
"source":"acrn-hypervisor/build/misc/debug_tools/acrn-crashlog/usercrash/bin/debugger", "source":"build/misc/debug_tools/acrn-crashlog/usercrash/bin/debugger",
"target":"usr/bin/" "target":"usr/bin/"
}, },
"usercrash-wrapper":{ "usercrash-wrapper":{
"source":"acrn-hypervisor/misc/debug_tools/acrn_crashlog/data/usercrash-wrapper", "source":"misc/debug_tools/acrn_crashlog/data/usercrash-wrapper",
"target":"usr/bin/" "target":"usr/bin/"
}, },
"acrn.32.out":{ "acrn.32.out":{
"source":"acrn-hypervisor/build/hypervisor/acrn.32.out", "source":"build/hypervisor/acrn.32.out",
"target":"boot/" "target":"boot/"
}, },
"ACPI_VM0.bin":{ "ACPI_VM0.bin":{
"source":"acrn-hypervisor/build/hypervisor/acpi/ACPI_VM0.bin", "source":"build/hypervisor/acpi/ACPI_VM0.bin",
"target":"boot" "target":"boot"
}, },
"ACPI_VM1.bin":{ "ACPI_VM1.bin":{
"source":"acrn-hypervisor/build/hypervisor/acpi/ACPI_VM1.bin", "source":"build/hypervisor/acpi/ACPI_VM1.bin",
"target":"boot" "target":"boot"
}, },
"100-acrn-grub":{ "100-acrn-grub":{
"source":"acrn-hypervisor/misc/packaging/100_ACRN", "source":"misc/packaging/100_ACRN",
"target":"etc/grub.d/" "target":"etc/grub.d/"
}, },
"serial.conf":{ "serial.conf":{
"source":"acrn-hypervisor/build/hypervisor/serial.conf", "source":"build/hypervisor/serial.conf",
"target":"etc/" "target":"etc/"
}, },
"50-acrn.netdev":{ "50-acrn.netdev":{
"source":"acrn-hypervisor/misc/packaging/50-acrn.netdev", "source":"misc/packaging/50-acrn.netdev",
"target":"usr/lib/systemd/network" "target":"usr/lib/systemd/network"
}, },
"50-acrn.network":{ "50-acrn.network":{
"source":"acrn-hypervisor/misc/packaging/50-acrn.network", "source":"misc/packaging/50-acrn.network",
"target":"usr/lib/systemd/network" "target":"usr/lib/systemd/network"
}, },
"50-eth.network":{ "50-eth.network":{
"source":"acrn-hypervisor/misc/packaging/50-eth.network", "source":"misc/packaging/50-eth.network",
"target":"usr/lib/systemd/network" "target":"usr/lib/systemd/network"
}, },
"50-tap0.netdev":{ "50-tap0.netdev":{
"source":"acrn-hypervisor/misc/packaging/50-tap0.netdev", "source":"misc/packaging/50-tap0.netdev",
"target":"usr/lib/systemd/network" "target":"usr/lib/systemd/network"
}, },
"acrnd.service":{ "acrnd.service":{
"source":"acrn-hypervisor/build/misc/services/acrnd.service", "source":"build/misc/services/acrnd.service",
"target":"usr/lib/systemd/system" "target":"usr/lib/systemd/system"
}, },
"acrnlog.service":{ "acrnlog.service":{
"source":"acrn-hypervisor/build/misc/debug_tools/acrnlog.service", "source":"build/misc/debug_tools/acrnlog.service",
"target":"usr/lib/systemd/system" "target":"usr/lib/systemd/system"
}, },
"acrnprobe.service":{ "acrnprobe.service":{
"source":"acrn-hypervisor/misc/debug_tools/acrn_crashlog/data/acrnprobe.service", "source":"misc/debug_tools/acrn_crashlog/data/acrnprobe.service",
"target":"usr/lib/systemd/system" "target":"usr/lib/systemd/system"
}, },
"usercrash.service":{ "usercrash.service":{
"source":"acrn-hypervisor/misc/debug_tools/acrn_crashlog/data/usercrash.service", "source":"misc/debug_tools/acrn_crashlog/data/usercrash.service",
"target":"usr/lib/systemd/system" "target":"usr/lib/systemd/system"
}, },
"libacrn-mngr.a":{ "libacrn-mngr.a":{
"source":"acrn-hypervisor/build/misc/services/libacrn-mngr.a", "source":"build/misc/services/libacrn-mngr.a",
"target":"usr/lib64" "target":"usr/lib64"
}, },
"acrnprobe.xml":{ "acrnprobe.xml":{
"source":"acrn-hypervisor/misc/debug_tools/acrn_crashlog/data/acrnprobe.xml", "source":"misc/debug_tools/acrn_crashlog/data/acrnprobe.xml",
"target":"usr/share/defaults/telemetrics" "target":"usr/share/defaults/telemetrics"
}, },
"OVMF.fd":{ "OVMF.fd":{
"source":"acrn-hypervisor/devicemodel/bios/OVMF.fd", "source":"devicemodel/bios/OVMF.fd",
"target":"usr/share/acrn/bios" "target":"usr/share/acrn/bios"
}, },
"40-watchdog.conf":{ "40-watchdog.conf":{
"source":"acrn-hypervisor/misc/debug_tools/acrn_crashlog/data/40-watchdog.conf", "source":"misc/debug_tools/acrn_crashlog/data/40-watchdog.conf",
"target":"usr/share/acrn/crashlog" "target":"usr/share/acrn/crashlog"
}, },
"80-coredump.conf":{ "80-coredump.conf":{
"source":"acrn-hypervisor/misc/debug_tools/acrn_crashlog/data/80-coredump.conf", "source":"misc/debug_tools/acrn_crashlog/data/80-coredump.conf",
"target":"usr/share/acrn/crashlog" "target":"usr/share/acrn/crashlog"
}, },
"launch_hard_rt_vm.sh":{ "launch_hard_rt_vm.sh":{
"source":"acrn-hypervisor/misc/config_tools/data/sample_launch_scripts/nuc/launch_hard_rt_vm.sh", "source":"misc/config_tools/data/sample_launch_scripts/nuc/launch_hard_rt_vm.sh",
"target":"usr/share/acrn/samples/nuc" "target":"usr/share/acrn/samples/nuc"
}, },
"launch_uos.sh":{ "launch_uos.sh":{
"source":"acrn-hypervisor/misc/config_tools/data/sample_launch_scripts/nuc/launch_uos.sh", "source":"misc/config_tools/data/sample_launch_scripts/nuc/launch_uos.sh",
"target":"usr/share/acrn/samples/nuc" "target":"usr/share/acrn/samples/nuc"
}, },
"launch_vxworks.sh":{ "launch_vxworks.sh":{
"source":"acrn-hypervisor/misc/config_tools/data/sample_launch_scripts/nuc/launch_vxworks.sh", "source":"misc/config_tools/data/sample_launch_scripts/nuc/launch_vxworks.sh",
"target":"usr/share/acrn/samples/nuc" "target":"usr/share/acrn/samples/nuc"
}, },
"launch_win.sh":{ "launch_win.sh":{
"source":"acrn-hypervisor/misc/config_tools/data/sample_launch_scripts/nuc/launch_win.sh", "source":"misc/config_tools/data/sample_launch_scripts/nuc/launch_win.sh",
"target":"usr/share/acrn/samples/nuc" "target":"usr/share/acrn/samples/nuc"
}, },
"launch_xenomai.sh":{ "launch_xenomai.sh":{
"source":"acrn-hypervisor/misc/config_tools/data/sample_launch_scripts/nuc/launch_xenomai.sh", "source":"misc/config_tools/data/sample_launch_scripts/nuc/launch_xenomai.sh",
"target":"usr/share/acrn/samples/nuc" "target":"usr/share/acrn/samples/nuc"
}, },
"launch_zephyr.sh":{ "launch_zephyr.sh":{
"source":"acrn-hypervisor/misc/config_tools/data/sample_launch_scripts/nuc/launch_zephyr.sh", "source":"misc/config_tools/data/sample_launch_scripts/nuc/launch_zephyr.sh",
"target":"usr/share/acrn/samples/nuc" "target":"usr/share/acrn/samples/nuc"
} }
} }

2
misc/packaging/gen_acrn_deb.py
View File

@ -92,7 +92,7 @@ def create_acrn_deb(board, scenario, version, build_dir):
target = deb_info[i]['target'] target = deb_info[i]['target']
if target == 'boot/': if target == 'boot/':
continue continue
source = cur_dir + '/../' + source source = cur_dir + source
target = deb_dir + target target = deb_dir + target
if os.path.exists(target): if os.path.exists(target):
run_command('cp %s %s' % (source, target), cur_dir) run_command('cp %s %s' % (source, target), cur_dir)