Forráskód Böngészése

使用麒麟软件源制作,添加了一些软件包

侠义书生 3 éve
szülő
commit
a2f32f5b3c

+ 22 - 0
meta-isar/conf/distro/kylin-v101.conf

@@ -0,0 +1,22 @@
+require conf/distro/debian-common.conf
+
+BASE_DISTRO = "kylin"
+
+DISTRO_APT_SOURCES ?= "conf/distro/${DISTRO}.list"
+# DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${DISTRO}-ports.list"
+# HOST_DISTRO_APT_SOURCES_append_arm64 = " ${DISTRO_APT_SOURCES}"
+
+BASE_DISTRO_CODENAME = "v101"
+
+# that is what debootstrap_1.0.118ubuntu1 does anyways
+DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/v101"
+
+DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
+
+DISTRO_KERNELS ?= " \
+    aws azure azure-edge gcp generic gke kvm lowlatency oem virtual \
+    snapdragon generic-lpae"
+
+IMAGE_PREINSTALL += "init make net-tools vim bash-completion network-manager iputils-ping iproute2 tmux"
+
+WIC_IMAGER_INSTALL += "python3-distutils"

+ 5 - 0
meta-isar/conf/distro/kylin-v101.list

@@ -0,0 +1,5 @@
+deb http://archive.launchpad.dev/kylin v101 main restricted universe multiverse
+deb-src http://archive.launchpad.dev/kylin v101 main restricted universe multiverse
+
+# deb http://172.29.220.242/kylin v101 main restricted universe multiverse
+# deb-src http://172.29.220.242/kylin v101 main restricted universe multiverse

+ 6 - 6
meta-isar/conf/distro/ubuntu-focal.list

@@ -1,6 +1,6 @@
-deb	[arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal main restricted universe multiverse
-deb-src	[arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal main restricted universe multiverse
-deb	[arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-updates main restricted universe multiverse
-deb-src	[arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-updates main restricted universe multiverse
-deb	[arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-security main restricted universe multiverse
-deb-src	[arch=amd64,i386] http://archive.ubuntu.com/ubuntu focal-security main restricted universe multiverse
+deb	[arch=amd64,i386] http://mirrors.163.com/ubuntu/ focal main restricted universe multiverse
+deb-src	[arch=amd64,i386] http://mirrors.163.com/ubuntu/ focal main restricted universe multiverse
+deb	[arch=amd64,i386] http://mirrors.163.com/ubuntu/ focal-updates main restricted universe multiverse
+deb-src	[arch=amd64,i386] http://mirrors.163.com/ubuntu/ focal-updates main restricted universe multiverse
+deb	[arch=amd64,i386] http://mirrors.163.com/ubuntu/ focal-security main restricted universe multiverse
+deb-src	[arch=amd64,i386] http://mirrors.163.com/ubuntu/ focal-security main restricted universe multiverse

+ 5 - 3
meta-isar/conf/local.conf.sample

@@ -18,7 +18,7 @@
 # of emulated machines available which can boot and run in the QEMU emulator:
 #
 # This sets the default machine to be qemuarm if no other machine is selected:
-MACHINE ??= "qemuarm"
+MACHINE ??= "qemuamd64"
 
 #
 # Isar Configuration Selection
@@ -27,8 +27,8 @@ MACHINE ??= "qemuarm"
 # generation of buildchroot environment and target root filesystem.
 #
 # This sets the default distribution configuration:
-DISTRO ??= "debian-bullseye"
-DISTRO_ARCH ??= "armhf"
+DISTRO ??= "kylin-v101"
+DISTRO_ARCH ??= "amd64"
 
 #
 # Multiple Configuration Selection
@@ -85,6 +85,8 @@ BBMULTICONFIG = " \
     sifive-fu540-sid-ports \
     qemuarm64-focal \
     qemuamd64-focal \
+    qemuamd64-v101 \
+    virtualbox-v101 \
 "
 
 #

+ 1 - 1
meta-isar/conf/machine/qemuamd64.conf

@@ -3,7 +3,7 @@
 
 DISTRO_ARCH ?= "amd64"
 
-KERNEL_NAME ?= "amd64"
+KERNEL_NAME ?= "generic"
 KERNEL_NAME_ubuntu-focal ?= "generic"
 
 IMAGE_FSTYPES ?= "wic-img"

+ 1 - 1
meta-isar/conf/machine/virtualbox.conf

@@ -5,7 +5,7 @@
 
 DISTRO_ARCH ?= "amd64"
 
-KERNEL_NAME ?= "amd64"
+KERNEL_NAME ?= "generic"
 
 WKS_FILE ?= "sdimage-efi"
 

+ 4 - 0
meta-isar/conf/multiconfig/qemuamd64-v101.conf

@@ -0,0 +1,4 @@
+MACHINE ?= "qemuamd64"
+DISTRO ?= "kylin-v101"
+
+IMAGE_FSTYPES ?= "wic-img ext4-img"

+ 8 - 0
meta-isar/conf/multiconfig/virtualbox-v101.conf

@@ -0,0 +1,8 @@
+#
+# Copyright (c) Siemens AG, 2020
+#
+# SPDX-License-Identifier: MIT
+
+
+MACHINE = "virtualbox"
+DISTRO = "kylin-v101"

+ 1 - 1
meta-isar/recipes-app/example-raw/files/postinst

@@ -18,7 +18,7 @@ cp -RTn /etc/skel ~isar
 
 chown -R isar:isar ~isar
 
-echo "isar" > /etc/hostname
+echo "ekylin" > /etc/hostname
 
 # this helps with ttys not know to this file (removed upstream with bullseye)
 rm -f /etc/securetty

+ 2 - 2
meta/recipes-core/isar-bootstrap/isar-bootstrap.inc

@@ -283,9 +283,9 @@ do_bootstrap() {
     if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then
         debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}"
     fi
-    if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" -a -z "${BASE_REPO_KEY}" ]; then
+    # if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" -a -z "${BASE_REPO_KEY}" ]; then
         debootstrap_args="$debootstrap_args --no-check-gpg"
-    fi
+    # fi
     E="${@ isar_export_proxies(d)}"
     export BOOTSTRAP_FOR_HOST debootstrap_args E