diff --git a/script/config/riscv64_qemu_image/rpmlist b/script/config/riscv64_qemu_image/rpmlist index 15e8e7fdfe706c6e097bdafa9e79bf7b5ee70c6b..63db2cd5746fc96dc6a65ec2f7ec4fadc73a4974 100644 --- a/script/config/riscv64_qemu_image/rpmlist +++ b/script/config/riscv64_qemu_image/rpmlist @@ -1,1133 +1,127 @@ -CUnit -GConf2 -GeoIP -GeoIP-GeoLite-data -ModemManager NetworkManager -ORBit2 -OpenIPMI -PackageKit -SDL -SDL2 -Xaw3d -abattis-cantarell-fonts -abseil-cpp -accountsservice +NetworkManager-config-server acl -acpid -adcli -adobe-mappings-cmap -adobe-mappings-pdf -adwaita-icon-theme -aide -alsa-firmware -alsa-lib -alsa-tools -amanda -apr -apr-util -argon2 -arptables -arpwatch -asciidoc at -at-spi2-atk -at-spi2-core -atk attr -atune -audiofile audit -augeas -authd authselect -autoconf -autogen -automake -avahi -babel -babeltrace basesystem bash bash-completion bc -bind -bind-dyndb-ldap -binutils -bison -blktrace -bluez -bolt -boost -bpg-dejavu-sans-fonts -bridge-utils -brltty -brotli -btrfs-progs -bubblewrap -busybox -byacc +bpftool bzip2 -c-ares -ca-certificates -cachefilesd -cairo -ccid -cdparanoia -cdrkit -cgdcbxd -check -checkpolicy -cheese -chkconfig chrony -chrpath cifs-utils -cjkuni-ukai-fonts -cloud-init -clutter -clutter-gst3 -clutter-gtk -cmake -cogl -color-filesystem -colord -colord-gtk -container-selinux -containernetworking-plugins -convmv -copy-jdk-configs coreutils cpio -cracklib -crash -crash-gcore-command -crash-trace-command -createrepo_c cronie crontabs -crypto-policies cryptsetup -ctags -cups -cups-filters -cups-pk-helper curl -cvs cyrus-sasl dbus -dbus-glib -dbus-python -dbxtool -dconf -dconf-editor -dejavu-fonts -desktop-file-utils -dhcp -dialog -diffstat -diffutils -ding-libs -djvulibre -dkms -dmidecode -dmraid dnf dnf-plugins-core -dnsmasq -docbook-dtds -docbook-style-xsl -docker dos2unix dosfstools -dracut -dropwatch -drpm -dtc +dracut-config-generic +dracut-config-rescue +dracut-network e2fsprogs -ebtables ed -efi-srpm-macros -efivar -elfutils -emacs -enchant -enchant2 -environment-modules -eog -esc ethtool -exempi -exiv2 -expat -expect -fakeroot -fcoe-utils -fftw file -file-roller filesystem -findutils -fio -fipscheck firewalld -flac -flatpak -flex -fltk -fontawesome-fonts -fontconfig -fonts-rpm-macros -fprintd -freeglut -freeradius -freerdp -freetype -fribidi -fros -ftp -fuse -fuse3 -fxload -gawk -gc -gcc -gcr -gd -gdb -gdbm -gdisk -gdk-pixbuf2 -geoclue2 -geocode-glib -gettext -gflags -gfs2-utils -ghostscript -giflib -git -gjs -gl-manpages -glew -glib-networking -glib2 glibc -glusterfs -gmp -gnu-free-serif-fonts gnupg2 -gnutls -gobject-introspection -golang -google-droid-sans-fonts -google-noto-cjk-fonts -google-noto-emoji-fonts -gperftools -gpgme -gpm -graphene -graphite2 -graphviz -grep -grilo -groff -grpc -grub2 grubby -gsettings-desktop-schemas -gsl -gsm -gsound -gspell -gssdp -gssproxy -gstreamer1 -gstreamer1-plugins-base -gtk2 -gtk3 -gubbi-fonts -guile -gupnp -gv -gzip -harfbuzz -haveged -hdf5 -hdparm -hicolor-icon-theme hostname -http-parser -httpd -hunspell -hunspell-en -hwdata -hwinfo -hwloc -hyphen -i2c-tools -ibus -ibus-sayura -ibus-table -ibus-table-array30 -icu -iio-sensor-proxy ima-evm-utils initscripts -intltool -iotop -ipcalc -iperf3 -ipmitool iproute iprutils -ipset -iptables -iptraf-ng iptstate iputils -ipvsadm irqbalance -iso-codes -isomd5sum -ivtv-firmware -iw -jansson -jbig2dec -jbigkit -jimtcl -jomolhari-fonts -jose -json-c -json-glib -jsoncpp -julietaula-montserrat-fonts -kacst-fonts kbd -keepalived kernel -keybinder3 -keyutils -kiwi -kmod -kmod-kvdo -krb5 -kurdit-unikurd-web-fonts -langtable -lapack -lato-fonts -lcms2 -ldns +kernel-tools less -lftp -lib-shim-v2 -libICE -libIDL -libSM -libX11 -libXau -libXaw -libXcomposite -libXcursor -libXdamage -libXdmcp -libXext -libXfixes -libXfont2 -libXft -libXi -libXinerama -libXmu -libXpm -libXrandr -libXrender -libXres -libXt -libXtst -libXv -libXvMC -libXxf86dga -libXxf86vm -libaec -libaio -libappstream-glib -libarchive -libart_lgpl -libassuan -libasyncns -libatasmart -libblockdev -libbonobo -libburn -libbytesize -libcanberra -libcap -libcap-ng -libcdio -libcdio-paranoia -libcgroup -libcomps -libconfig -libdaemon -libdatrie -libdazzle -libdb -libdbi -libdmx -libdnet -libdnf -libdrm -libdvdread -libecap -libedit -libepoxy -liberation-fonts -libesmtp -libestr -libev -libevdev -libevent -libevhtp -libexif -libfastjson -libffi -libfontenc -libfprint -libgcrypt -libgee -libgexiv2 -libglade2 -libglvnd -libgmem -libgpg-error -libgphoto2 -libgsf -libgtop2 -libgudev -libgusb -libgweather -libgxps -libhandy -libhugetlbfs -libical -libidn -libidn2 -libieee1284 -libijs -libimagequant -libimobiledevice -libinput -libiptcdata -libiscsi -libisoburn -libisofs -libjpeg-turbo -libkcapi -libksba -libldb -libmaxminddb -libmbim -libmediaart -libmemcached -libmetalink -libmicrohttpd -libmng -libmnl -libmodulemd -libmpc -libmspack -libmtp -libndp -libnet -libnetfilter_conntrack -libnetfilter_queue -libnfnetlink -libnftnl -libnl3 -libnma -libnotify -libnsl2 -liboauth -libogg -libosinfo -libpaper -libpcap -libpciaccess -libpeas -libpfm -libpipeline -libplist -libpng -libpq -libproxy -libpsl -libpwquality -libqmi -libquvi -libquvi-scripts -librelp -librepo -libreport -libreswan -librsvg2 -libsamplerate -libseccomp -libsecret -libselinux -libsemanage -libsepol -libserf -libsexy -libsigsegv -libsndfile -libsolv -libsoup -libspectre -libssh -libssh2 -libstemmer -libtalloc -libtar -libtasn1 +libstoragemgmt libteam -libtevent -libthai -libtheora -libtiff -libtirpc -libtomcrypt -libtommath -libtool -libunistring -libunwind -libusb -libusbmuxd -libusbx -libuser -libutempter -libuv -libverto -libvisual -libvorbis -libwacom -libwebp -libwebsockets -libwnck3 -libwpe -libx86emu -libxcb -libxcrypt -libxkbcommon -libxkbfile -libxklavier -libxml2 -libxshmfence -libxslt -libyaml linux-firmware -linuxconsoletools -lksctp-tools -lldpad -llvm -lm_sensors -lmdb -lockdev logrotate -lorax -low-memory-monitor -lrzsz lshw lsof lsscsi -ltrace -lttng-ust -lua -lua-expat -lua-json -lua-lpeg -lua-posix -lua-socket -luksmeta lvm2 -lxc -lxcfs -lz4 -lzo -lzop -m4 -madan-fonts mailcap -mailx -make man-db man-pages -mariadb -mariadb-connector-c -mc -mcpp -mcstrans mdadm -memcached -mercurial -mesa-demos -mesa-libGL -mesa-libGLU -metacity -minicom -mksh mlocate -mobile-broadband-provider-info -mod_fcgid -mod_http2 -mod_security -mokutil -mozilla-filesystem -mpfr -mstflint -mtdev -mtools mtr -mtx -multipath-tools -nafees-web-naskh-fonts nano -navilu-fonts -ncompress ncurses -ndctl -ndisc6 -net-snmp net-tools -netcf -nettle -network-manager-applet -newt nfs-utils -nfs4-acl-tools -nftables -nghttp2 nmap -notification-daemon -npth -nspr -nss -nss-mdns -nss-pam-ldapd -nss-pem -nss_nis -ntpstat -numactl -numad -oddjob -open-iscsi -open-isns -openEuler-indexhtml openEuler-latest-release -openEuler-logos openEuler-release -openEuler-repos -openEuler-rpm-config -openblas -openjpeg2 -openldap -opensc -openscap -openslp -opensm openssh -openssl -openssl-pkcs11 -openvpn -openvswitch -openwsman -opus -orc -os-prober -osinfo-db -osinfo-db-tools -ostree -overpass-fonts -p11-kit -paktype-naqsh-fonts -paktype-naskh-basic-fonts -paktype-tehreer-fonts -pam -pango -papi -paratype-pt-sans-fonts +openssh-clients +openssh-server parted passwd -patch -patchutils -pbzip2 pciutils -pcp -pcre -pcre2 -pcsc-lite -perftest -perl -perl-Algorithm-Diff -perl-Archive-Tar -perl-B-Debug -perl-CPAN-Meta -perl-CPAN-Meta-Requirements -perl-CPAN-Meta-YAML -perl-Carp -perl-Compress-Raw-Bzip2 -perl-Compress-Raw-Zlib -perl-Config-Perl-V -perl-DBD-MariaDB -perl-DBD-MySQL -perl-DBD-SQLite -perl-DBI -perl-Data-Dump -perl-Data-Dumper -perl-Devel-PPPort -perl-Digest -perl-Digest-HMAC -perl-Digest-MD5 -perl-Digest-SHA -perl-Encode -perl-Encode-Locale -perl-Env -perl-Error -perl-Exporter -perl-Exporter-Tiny -perl-ExtUtils-Install -perl-ExtUtils-MakeMaker -perl-ExtUtils-Manifest -perl-ExtUtils-ParseXS -perl-Fedora-VSP -perl-File-Fetch -perl-File-HomeDir -perl-File-Listing -perl-File-Path -perl-File-Temp -perl-File-Which -perl-Filter -perl-Filter-Simple -perl-Getopt-Long -perl-HTML-Parser -perl-HTML-Tagset -perl-HTTP-Cookies -perl-HTTP-Date -perl-HTTP-Message -perl-HTTP-Negotiate -perl-HTTP-Tiny -perl-IO-Compress -perl-IO-HTML -perl-IO-Socket-IP -perl-IO-Socket-SSL -perl-IPC-Cmd -perl-IPC-SysV -perl-IPC-System-Simple -perl-JSON -perl-JSON-PP -perl-LWP-MediaTypes -perl-List-MoreUtils -perl-List-MoreUtils-XS -perl-Locale-Codes -perl-Locale-Maketext -perl-MIME-Base64 -perl-Math-BigInt -perl-Math-BigInt-FastCalc -perl-Math-BigRat -perl-Module-CoreList -perl-Module-Load -perl-Module-Load-Conditional -perl-Module-Metadata -perl-Mozilla-CA -perl-NTLM -perl-Net-HTTP -perl-Net-SSLeay -perl-Params-Check -perl-PathTools -perl-Perl-OSType -perl-PerlIO-via-QuotedPrint -perl-Pod-Checker -perl-Pod-Escapes -perl-Pod-Parser -perl-Pod-Perldoc -perl-Pod-Simple -perl-Pod-Usage -perl-Scalar-List-Utils -perl-Socket -perl-Storable -perl-Sys-Syslog -perl-Term-ANSIColor -perl-Term-Cap -perl-TermReadKey -perl-Test-Harness -perl-Test-Simple -perl-Text-Balanced -perl-Text-Diff -perl-Text-ParseWords -perl-Text-Tabs+Wrap -perl-Text-Unidecode -perl-Thread-Queue -perl-Time-HiRes -perl-Time-Local -perl-TimeDate -perl-Try-Tiny -perl-URI -perl-Unicode-Collate -perl-Unicode-Normalize -perl-WWW-RobotRules -perl-XML-NamespaceSupport -perl-XML-Parser -perl-XML-SAX -perl-XML-SAX-Base -perl-XML-Simple -perl-XML-Writer -perl-XML-XPath -perl-autodie -perl-bignum -perl-constant -perl-experimental -perl-generators -perl-libnet -perl-libwww-perl -perl-parent -perl-perlfaq -perl-podlators -perl-threads -perl-threads-shared -perl-version -pesign -pigz -pinentry pinfo -pixman -pkcs11-helper -pkgconf plymouth -pngquant policycoreutils -polkit -polkit-pkla-compat -poppler -poppler-data -popt -postfix -powertop -ppp -procmail procps-ng -protobuf -protobuf-c psacct -psmisc -publicsuffix-list -pulseaudio -pykickstart -pytest -python-IPy -python-aniso8601 -python-apipkg -python-argcomplete -python-asn1crypto -python-attrs -python-beaker -python-cffi -python-chardet -python-click -python-configobj -python-cryptography -python-dasbus -python-dateutil -python-decorator -python-dict2xml -python-distro -python-execnet -python-flask -python-flask-restful -python-hypothesis -python-idna -python-iniconfig -python-iniparse -python-inotify -python-itsdangerous -python-jinja2 -python-joblib -python-jsonpatch -python-jsonpointer -python-jsonschema -python-jwt -python-linux-procfs -python-lxml -python-mako -python-markupsafe -python-meh -python-ntplib -python-oauthlib -python-packaging -python-pandas -python-paste -python-pid -python-pip -python-pluggy -python-ply -python-prettytable -python-py -python-pyaml -python-pycdlib -python-pycparser -python-pycurl -python-pydbus -python-pyrsistent -python-pysocks -python-pytest-forked -python-pytest-xdist -python-pyudev -python-requests -python-requests-file -python-requests-ftp -python-responses -python-rtslib -python-schedutils -python-scikit-learn -python-scikit-optimize -python-setuptools -python-simpleline -python-six -python-sortedcontainers -python-systemd -python-tempita -python-threadpoolctl -python-toml -python-urlgrabber -python-xgboost -python3 -python3-cairo -python3-dmidecode -python3-gobject -python3-kmod -python3-ordered-set -python3-productmd -python3-pyOpenSSL -python3-pyatspi -python3-pyparsing -python3-pyserial -python3-pytz -python3-pyxattr -python3-pyyaml -python3-rpm-generators -python3-scipy -python3-slip -python3-urllib3 -qemu -qpdf -qperf -qrencode -qt5 -qt5-qtbase -qt5-qtdoc -qt5-qttranslations quota -radvd -rarian -rasdaemon -rdate rdma-core -re2 -readline realmd -recode -rest -rhash +rng-tools rootfiles -rpcbind rpm -rpmdevtools -rpmlint -rpmrebuild -rrdtool rsync rsyslog -rtkit -ruby -saab-fonts -samba -samyak-fonts-common -sane-backends -sanlock -satyr -sbc -sblim-sfcc -scap-security-guide -screen -sdparm +rsyslog-relp security-tool -sed -selinux-policy -sendmail -setools -setserial +selinux-policy-mls +selinux-policy-targeted setup sg3_utils -sgml-common -sgpio shadow -shared-mime-info -sharutils -sil-abyssinica-fonts -sil-nuosu-fonts -sil-padauk-fonts -sil-scheherazade-fonts -skopeo -slang smartmontools -smc-fonts -smp_utils -snappy -softhsm -sound-theme-freedesktop -source-highlight -speex -speexdsp -spice-server -spice-vdagent -sqlite -squashfs-tools -squid sssd -startup-notification -stix-fonts strace -strongswan -subunit -subversion sudo -switcheroo-control symlinks sysfsutils -sysprof -sysstat systemd -systemtap -taglib -tang +systemd-udev tar -tbb -tcl -tcp_wrappers tcpdump -tcsh -telepathy-filesystem -telepathy-glib -telepathy-logger -telnet -texinfo -texlive-scheme-basic -tftp -thai-scalable-fonts -thin-provisioning-tools -tibetan-machine-uni-fonts -tigervnc time -timedatex -tipcutils -tk -tmux -tog-pegasus -tokyocabinet -totem-pl-parser -tpm-quote-tools -tpm-tools -tpm2-abrmd -tpm2-tools -tpm2-tss -trace-cmd traceroute -tracker3 -tracker3-miners tree -trousers tuned -tzdata -udisks2 -unbound -units -unixODBC unzip -upower -urw-base35-fonts -usb_modeswitch -usb_modeswitch-data -usbmuxd -usbredir usbutils -usermode -userspace-rcu -ustr -utf8proc util-linux -v4l-utils -vdo -vim -vino -virglrenderer +util-linux-user +vim-enhanced +vim-minimal virt-what -volume_key -vsftpd -vte291 -vulkan-loader -wayland -wayland-protocols-devel -webkit2gtk3 -webrtc-audio-processing wget which -woff2 words -wpa_supplicant -wpebackend-fdo -wqy-microhei-fonts -wqy-zenhei-fonts -x3270 -xcb-util -xdelta -xdg-dbus-proxy -xdg-user-dirs -xdg-user-dirs-gtk -xdg-utils xfsdump xfsprogs -xinetd -xkeyboard-config -xmlrpc-c -xmlsec1 -xmlto -xorg-x11-drivers -xorg-x11-drv-ati -xorg-x11-drv-dummy -xorg-x11-drv-evdev -xorg-x11-drv-fbdev -xorg-x11-drv-libinput -xorg-x11-drv-nouveau -xorg-x11-drv-v4l -xorg-x11-drv-wacom -xorg-x11-font-utils -xorg-x11-fonts -xorg-x11-proto-devel -xorg-x11-server -xorg-x11-server-utils -xorg-x11-utils -xorg-x11-xauth -xorg-x11-xinit -xorg-x11-xkb-utils -xrestop -xterm -xvattr -xz -yajl -yelp -yelp-xsl -yp-tools -ypbind -ypserv -zenity +yum zip -zlib -zstd -zziplib +zsh diff --git a/script/config/riscv64_qemu_image/shadow.template b/script/config/riscv64_qemu_image/shadow.template index b504cef35dba25ae5621aa6f590aefa60f162046..f4aeb94799642a723bfe4faa83f6b63e6694fc30 100644 --- a/script/config/riscv64_qemu_image/shadow.template +++ b/script/config/riscv64_qemu_image/shadow.template @@ -1,21 +1 @@ -root:$6$MznPTm975Bnsg/dt$c1KaR1SlMGkz.Sue7LPkCeK8YOz0Nk1DSAXhoSqkDDjmBqrNo3N9tVWu4izrct53r3I0KauFlWVAPM.dfF9Yr/:19451:0:99999:7::: -bin:*:19564:0:99999:7::: -daemon:*:19564:0:99999:7::: -adm:*:19564:0:99999:7::: -lp:*:19564:0:99999:7::: -sync:*:19564:0:99999:7::: -shutdown:*:19564:0:99999:7::: -halt:*:19564:0:99999:7::: -mail:*:19564:0:99999:7::: -operator:*:19564:0:99999:7::: -games:*:19564:0:99999:7::: -ftp:*:19564:0:99999:7::: -nobody:*:19564:0:99999:7::: -systemd-coredump:!:19566:::::: -unbound:!:19566:::::: -sshd:!:19566:::::: -dbus:!:19566:::::: -tss:!:19566:::::: -systemd-network:!*:19566:::::: -systemd-resolve:!*:19566:::::: -systemd-timesync:!*:19566:::::: \ No newline at end of file +root:$6$MznPTm975Bnsg/dt$c1KaR1SlMGkz.Sue7LPkCeK8YOz0Nk1DSAXhoSqkDDjmBqrNo3N9tVWu4izrct53r3I0KauFlWVAPM.dfF9Yr/:19451:0:99999:7::: \ No newline at end of file diff --git a/script/setup_env.sh b/script/setup_env.sh index 278682ce2263127e321b02116dc5d32601e70058..0df6abfcb592f54fca4a38893a0726d013f0a769 100644 --- a/script/setup_env.sh +++ b/script/setup_env.sh @@ -26,7 +26,11 @@ export RELEASE_HTTP_URL="http://121.36.84.172/dailybuild" SUB_STANDARD_REPO_URL="$(echo ${OBS_STANDARD_PROJECT//:/:\/})" SUB_EPOL_REPO_URL="$(echo ${OBS_EPOL_PROJECT//:/:\/})" SUB_EXTRAS_REPO_URL="$(echo ${OBS_EXTRAS_PROJECT//:/:\/})" -export OBS_STANDARD_REPO_URL="http://${OBS_SERVER_IP}:82/${SUB_STANDARD_REPO_URL}/standard_${ARCH}" +if [[ "${OBS_STANDARD_PROJECT}" =~ "RISC-V" ]] ;then + export OBS_STANDARD_REPO_URL="http://${OBS_SERVER_IP}:82/${SUB_STANDARD_REPO_URL}/BaseOS" +else + export OBS_STANDARD_REPO_URL="http://${OBS_SERVER_IP}:82/${SUB_STANDARD_REPO_URL}/standard_${ARCH}" +fi export OBS_EPOL_REPO_URL="http://${OBS_SERVER_IP}:82/${SUB_EPOL_REPO_URL}/standard_${ARCH}" export OBS_EXTRAS_REPO_URL="http://${OBS_SERVER_IP}:82/${SUB_EXTRAS_REPO_URL}/standard_${ARCH}" export OBS_BRINGINRELY_URL= diff --git a/script/step/make_riscv64_qemu_image.sh b/script/step/make_riscv64_qemu_image.sh index d20d37bbff864764f98103354cee3115f66b375f..f4408d7f9e75632c723d427b0e9e254b5ba9be77 100644 --- a/script/step/make_riscv64_qemu_image.sh +++ b/script/step/make_riscv64_qemu_image.sh @@ -9,7 +9,6 @@ fi set -e export OPENEULER_CHROOT_PATH="/usr1/openeuler" yum_conf="/home/config/repo_conf/obs-repo.conf" -chroot_rpm_get_path="${BUILD_SCRIPT_DIR}/oE_Chroot_RPM" hw_arch="$(uname -m)" IMAGE_SIZE_MB=16384 @@ -211,7 +210,9 @@ make_img() # locale cat ${rootfs_dir}/usr/share/zoneinfo/Asia/Shanghai > ${rootfs_dir}/etc/localtime # root password - cat /home/config/riscv64_qemu_image/shadow.template > ${rootfs_dir}/etc/shadow + shadow_string=$(cat /home/config/riscv64_qemu_image/shadow.template) + echo $shadow_string + sed -i "s#root:.*#$shadow_string#g" ${rootfs_dir}/etc/fstab # hostname echo openeuler > ${rootfs_dir}/etc/hostname