Compare commits
No commits in common. "4607885af9bf51964c8bf281e442c9c81c031735" and "a830232acdbaccf18461ec00694b9e24227d8c60" have entirely different histories.
4607885af9
...
a830232acd
File diff suppressed because it is too large
Load Diff
@ -1,146 +0,0 @@
|
|||||||
From e1c79ca3f09be156d54e98b5733da3290951cc44 Mon Sep 17 00:00:00 2001
|
|
||||||
From: jiahua_yu <jiahua.yu@shingroup.cn>
|
|
||||||
Date: Mon, 24 Jun 2024 16:58:24 +0800
|
|
||||||
Subject: [PATCH 1/3] init support for arch ppc64le
|
|
||||||
|
|
||||||
---
|
|
||||||
isocut/isocut.py | 7 +++++++
|
|
||||||
isomaker/init.sh | 2 +-
|
|
||||||
isomaker/iso.sh | 27 +++++++++++++++++++++++++++
|
|
||||||
3 files changed, 35 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/isocut/isocut.py b/isocut/isocut.py
|
|
||||||
index 8578f83..6332f4e 100755
|
|
||||||
--- a/isocut/isocut.py
|
|
||||||
+++ b/isocut/isocut.py
|
|
||||||
@@ -442,6 +442,8 @@ def regen_repodata():
|
|
||||||
pack.text = pack.text.split(".aarch64")[0]
|
|
||||||
elif os.uname()[-1].strip() == 'loongarch64':
|
|
||||||
pack.text = pack.text.split(".loongarch64")[0]
|
|
||||||
+ elif os.uname()[-1].strip() == 'ppc64le'[0]:
|
|
||||||
+ pack.text = pack.text.split(".ppc64le")[0]
|
|
||||||
pack.text = pack.text.split(".noarch")[0]
|
|
||||||
fp_rpm.close()
|
|
||||||
|
|
||||||
@@ -687,6 +689,11 @@ def remake_iso():
|
|
||||||
"-joliet-long -allow-multidot -allow-leading-dots -no-bak -V \"%s\" " \
|
|
||||||
"-o \"%s\" -e images/efiboot.img -no-emul-boot \"%s\"" % (
|
|
||||||
ICONFIG.new_iso_name, ICONFIG.dest_iso, ICONFIG.temp_path_new_image)
|
|
||||||
+ elif os.uname()[-1].strip() == 'ppc64le':
|
|
||||||
+ make_iso_cmd = "genisoimage -joliet-long -U -J -R -T -part -hfs -r -l -sysid PPC " \
|
|
||||||
+ "-V \"%s\" -o \"%s\" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 " \
|
|
||||||
+ "-no-desktop -allow-multidot " % (
|
|
||||||
+ ICONFIG.iso_desc, ICONFIG.dest_iso, ICONFIG.temp_path_new_image)
|
|
||||||
dest_iso_path = os.path.dirname(ICONFIG.dest_iso)
|
|
||||||
if not (dest_iso_path is None or dest_iso_path ==
|
|
||||||
"") and not os.path.exists(dest_iso_path):
|
|
||||||
diff --git a/isomaker/init.sh b/isomaker/init.sh
|
|
||||||
index f3222ec..00aadd3 100644
|
|
||||||
--- a/isomaker/init.sh
|
|
||||||
+++ b/isomaker/init.sh
|
|
||||||
@@ -35,7 +35,7 @@ function parse_cmd_line()
|
|
||||||
{
|
|
||||||
#param init
|
|
||||||
ARCH="$(uname -m)"
|
|
||||||
- if [ "${ARCH}" = "aarch64" ] || [ "${ARCH}" = "x86_64" ] || [ "${ARCH}" = "loongarch64" ];then
|
|
||||||
+ if [ "${ARCH}" = "aarch64" ] || [ "${ARCH}" = "x86_64" ] || [ "${ARCH}" = "loongarch64" ] || [ "${ARCH}" = "ppc64le" ];then
|
|
||||||
CONFIG_FILE="${CPATH}/config/${ARCH}/standard.conf"
|
|
||||||
source "${CONFIG_FILE}"
|
|
||||||
else
|
|
||||||
diff --git a/isomaker/iso.sh b/isomaker/iso.sh
|
|
||||||
index 7bf0bf9..211a8ed 100644
|
|
||||||
--- a/isomaker/iso.sh
|
|
||||||
+++ b/isomaker/iso.sh
|
|
||||||
@@ -29,6 +29,9 @@ function gen_debug_iso()
|
|
||||||
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then
|
|
||||||
mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DBG_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
||||||
[ $? != 0 ] && return 1
|
|
||||||
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
||||||
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${DBG_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
||||||
+ [ $? != 0 ] && return 1
|
|
||||||
fi
|
|
||||||
implantisomd5 "${OUTPUT_DIR}/${DBG_ISO_NAME}"
|
|
||||||
return 0
|
|
||||||
@@ -43,6 +46,9 @@ function gen_standard_iso()
|
|
||||||
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then
|
|
||||||
mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
||||||
[ $? != 0 ] && return 1
|
|
||||||
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
||||||
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
||||||
+ [ $? != 0 ] && return 1
|
|
||||||
fi
|
|
||||||
implantisomd5 "${OUTPUT_DIR}/${STANDARD_ISO_NAME}"
|
|
||||||
return 0
|
|
||||||
@@ -60,6 +66,9 @@ function gen_edge_iso()
|
|
||||||
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then
|
|
||||||
mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${EDGE_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
||||||
[ $? != 0 ] && return 1
|
|
||||||
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
||||||
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
||||||
+ [ $? != 0 ] && return 1
|
|
||||||
fi
|
|
||||||
implantisomd5 "${OUTPUT_DIR}/${EDGE_ISO_NAME}"
|
|
||||||
return 0
|
|
||||||
@@ -77,6 +86,9 @@ function gen_desktop_iso()
|
|
||||||
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then
|
|
||||||
mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DESKTOP_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
||||||
[ $? != 0 ] && return 1
|
|
||||||
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
||||||
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
||||||
+ [ $? != 0 ] && return 1
|
|
||||||
fi
|
|
||||||
implantisomd5 "${OUTPUT_DIR}/${DESKTOP_ISO_NAME}"
|
|
||||||
return 0
|
|
||||||
@@ -94,6 +106,9 @@ function gen_src_iso()
|
|
||||||
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then
|
|
||||||
mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${SRC_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
||||||
[ $? != 0 ] && return 1
|
|
||||||
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
||||||
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
||||||
+ [ $? != 0 ] && return 1
|
|
||||||
fi
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
@@ -113,6 +128,9 @@ function gen_everything_iso()
|
|
||||||
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then
|
|
||||||
mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
||||||
[ $? != 0 ] && return 1
|
|
||||||
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
||||||
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
||||||
+ [ $? != 0 ] && return 1
|
|
||||||
fi
|
|
||||||
implantisomd5 /result/"${EVE_ISO_NAME}"
|
|
||||||
return 0
|
|
||||||
@@ -132,6 +150,9 @@ function gen_everything_debug_iso()
|
|
||||||
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then
|
|
||||||
mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_DEBUG_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
||||||
[ $? != 0 ] && return 1
|
|
||||||
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
||||||
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
||||||
+ [ $? != 0 ] && return 1
|
|
||||||
fi
|
|
||||||
implantisomd5 /result/"${EVE_DEBUG_ISO_NAME}"
|
|
||||||
return 0
|
|
||||||
@@ -151,6 +172,9 @@ function gen_everything_src_iso()
|
|
||||||
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then
|
|
||||||
mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_SRC_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
||||||
[ $? != 0 ] && return 1
|
|
||||||
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
||||||
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
||||||
+ [ $? != 0 ] && return 1
|
|
||||||
fi
|
|
||||||
implantisomd5 /result/"${EVE_SRC_ISO_NAME}"
|
|
||||||
return 0
|
|
||||||
@@ -164,6 +188,9 @@ function gen_netinst_iso()
|
|
||||||
isohybrid -u /result/"${NETINST_ISO_NAME}"
|
|
||||||
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then
|
|
||||||
mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${NETINST_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
||||||
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
||||||
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
||||||
+ [ $? != 0 ] && return 1
|
|
||||||
fi
|
|
||||||
implantisomd5 /result/"${NETINST_ISO_NAME}"
|
|
||||||
return 0
|
|
||||||
--
|
|
||||||
2.43.0
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,43 +0,0 @@
|
|||||||
From 7f780bfae1b2e6283f03357865fef0618d28beac Mon Sep 17 00:00:00 2001
|
|
||||||
From: jiahua_yu <jiahua.yu@shingroup.cn>
|
|
||||||
Date: Tue, 25 Jun 2024 11:42:08 +0800
|
|
||||||
Subject: [PATCH 3/3] add-support-for-ppc64le-runtime-install
|
|
||||||
|
|
||||||
---
|
|
||||||
isomaker/80-openeuler/runtime-cleanup.tmpl | 2 ++
|
|
||||||
isomaker/80-openeuler/runtime-install.tmpl | 5 +++++
|
|
||||||
2 files changed, 7 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/isomaker/80-openeuler/runtime-cleanup.tmpl b/isomaker/80-openeuler/runtime-cleanup.tmpl
|
|
||||||
index 256d013..3bcfc22 100644
|
|
||||||
--- a/isomaker/80-openeuler/runtime-cleanup.tmpl
|
|
||||||
+++ b/isomaker/80-openeuler/runtime-cleanup.tmpl
|
|
||||||
@@ -254,7 +254,9 @@ removefrom ncurses /usr/bin/captoinfo /usr/bin/infocmp /usr/bin/infotocap
|
|
||||||
removefrom ncurses /usr/bin/reset /usr/bin/tabs /usr/bin/tic /usr/bin/toe
|
|
||||||
removefrom ncurses /usr/bin/tput /usr/bin/tset
|
|
||||||
removefrom ncurses-libs /usr/${libdir}/libform*
|
|
||||||
+%if basearch != 'ppc64le':
|
|
||||||
removefrom ncurses-libs /usr/${libdir}/libmenu*
|
|
||||||
+%endif
|
|
||||||
removefrom ncurses-libs /usr/${libdir}/libpanel.* /usr/${libdir}/libtic*
|
|
||||||
removefrom net-tools */bin/netstat */sbin/ether-wake */sbin/ipmaddr
|
|
||||||
removefrom net-tools */sbin/iptunnel */sbin/mii-diag */sbin/mii-tool
|
|
||||||
diff --git a/isomaker/80-openeuler/runtime-install.tmpl b/isomaker/80-openeuler/runtime-install.tmpl
|
|
||||||
index 9937e70..6e400e7 100644
|
|
||||||
--- a/isomaker/80-openeuler/runtime-install.tmpl
|
|
||||||
+++ b/isomaker/80-openeuler/runtime-install.tmpl
|
|
||||||
@@ -52,6 +52,11 @@ installpkg glibc-all-langpacks
|
|
||||||
installpkg grub2-efi-loongarch64 grub2-efi-loongarch64-cdboot grub2-efi-loongarch64-modules
|
|
||||||
installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
|
|
||||||
%endif
|
|
||||||
+%if basearch in ("ppc64le"):
|
|
||||||
+ installpkg powerpc-utils lsvpd ppc64-diag
|
|
||||||
+ installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
|
|
||||||
+ installpkg grub2-ppc64le
|
|
||||||
+%endif
|
|
||||||
|
|
||||||
## yay, plymouth
|
|
||||||
installpkg plymouth
|
|
||||||
--
|
|
||||||
2.43.0
|
|
||||||
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
From 52f60354b4d48a0b3c2a25ddabb10a47073bfb0c Mon Sep 17 00:00:00 2001
|
|
||||||
From: wangchong1995924 <15229716099@163.com>
|
|
||||||
Date: Wed, 10 Jul 2024 15:28:00 +0800
|
|
||||||
Subject: [PATCH] fix issue IABY7K
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh
|
|
||||||
index a9efe4b..b2ba4de 100644
|
|
||||||
--- a/isomaker/rpm.sh
|
|
||||||
+++ b/isomaker/rpm.sh
|
|
||||||
@@ -185,7 +185,7 @@ function get_desktop_rpms()
|
|
||||||
|
|
||||||
function get_everything_rpms()
|
|
||||||
{
|
|
||||||
- yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "\.noarch|\.${ARCH}" | grep -v "debuginfo" | grep -v "debugsource" > ava_every_lst
|
|
||||||
+ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "\.noarch|\.${ARCH}" | grep -v "debuginfo\." | grep -v "debugsource\." > ava_every_lst
|
|
||||||
parse_rpmlist_xml "exclude"
|
|
||||||
cat parsed_rpmlist_exclude
|
|
||||||
if [ -s parsed_rpmlist_exclude ];then
|
|
||||||
@@ -259,7 +259,7 @@ function everything_source_rpms_download()
|
|
||||||
function everything_debug_rpms_download()
|
|
||||||
{
|
|
||||||
mkdir ${EVERY_DEBUG_DIR}
|
|
||||||
- yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "debuginfo|debugsource" > ava_debug_lst
|
|
||||||
+ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "debuginfo\.|debugsource\." > ava_debug_lst
|
|
||||||
parse_rpmlist_xml "everything_debug_exclude"
|
|
||||||
cat parsed_rpmlist_everything_debug_exclude
|
|
||||||
if [ -s parsed_rpmlist_everything_debug_exclude ];then
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
@ -1,416 +0,0 @@
|
|||||||
From a6cbb0da0f21b232dfc3386bc9f9986f6df51913 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Wenlong Zhang <zhangwenlong@loongson.cn>
|
|
||||||
Date: Tue, 28 May 2024 03:48:32 +0000
|
|
||||||
Subject: [PATCH] add loongarch64 support for livecd
|
|
||||||
|
|
||||||
---
|
|
||||||
isomaker/config/common/livecd/live/efi.tmpl | 12 ++-
|
|
||||||
isomaker/config/loongarch64/ks.cfg | 28 ++++++
|
|
||||||
.../live/config_files/loongarch64/boot.msg | 5 +
|
|
||||||
.../live/config_files/loongarch64/grub.conf | 9 ++
|
|
||||||
.../config_files/loongarch64/grub2-efi.cfg | 47 ++++++++++
|
|
||||||
.../loongarch64/livecd/live/loongarch64.tmpl | 75 +++++++++++++++
|
|
||||||
.../loongarch64/livecd/livecd_loongarch64.ks | 70 ++++++++++++++
|
|
||||||
isomaker/config/loongarch64/livecd/rpmlist | 91 +++++++++++++++++++
|
|
||||||
8 files changed, 334 insertions(+), 3 deletions(-)
|
|
||||||
create mode 100644 isomaker/config/loongarch64/ks.cfg
|
|
||||||
create mode 100644 isomaker/config/loongarch64/livecd/live/config_files/loongarch64/boot.msg
|
|
||||||
create mode 100644 isomaker/config/loongarch64/livecd/live/config_files/loongarch64/grub.conf
|
|
||||||
create mode 100644 isomaker/config/loongarch64/livecd/live/config_files/loongarch64/grub2-efi.cfg
|
|
||||||
create mode 100644 isomaker/config/loongarch64/livecd/live/loongarch64.tmpl
|
|
||||||
create mode 100644 isomaker/config/loongarch64/livecd/livecd_loongarch64.ks
|
|
||||||
create mode 100644 isomaker/config/loongarch64/livecd/rpmlist
|
|
||||||
|
|
||||||
diff --git a/isomaker/config/common/livecd/live/efi.tmpl b/isomaker/config/common/livecd/live/efi.tmpl
|
|
||||||
index 9a57df4..e7a61a4 100644
|
|
||||||
--- a/isomaker/config/common/livecd/live/efi.tmpl
|
|
||||||
+++ b/isomaker/config/common/livecd/live/efi.tmpl
|
|
||||||
@@ -11,9 +11,15 @@ mkdir ${EFIBOOTDIR}/fonts/
|
|
||||||
install usr/share/shim/lockdown.efi ${EFIBOOTDIR}/
|
|
||||||
%endif
|
|
||||||
%if efiarch64:
|
|
||||||
-install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
|
|
||||||
-install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
|
|
||||||
-install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi
|
|
||||||
+ %if efiarch64 == 'LOONGARCH64':
|
|
||||||
+ install boot/efi/EFI/openEuler/grubloongarch64.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
|
|
||||||
+ install boot/efi/EFI/openEuler/grubloongarch64.efi ${EFIBOOTDIR}/BOOTLOONGARCH.EFI
|
|
||||||
+ install boot/efi/EFI/openEuler/grubloongarch64.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi
|
|
||||||
+ %else:
|
|
||||||
+ install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
|
|
||||||
+ install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
|
|
||||||
+ install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi
|
|
||||||
+ %endif
|
|
||||||
%endif
|
|
||||||
install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
|
|
||||||
|
|
||||||
diff --git a/isomaker/config/loongarch64/ks.cfg b/isomaker/config/loongarch64/ks.cfg
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..129d653
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/isomaker/config/loongarch64/ks.cfg
|
|
||||||
@@ -0,0 +1,28 @@
|
|
||||||
+# version=openEuler 20.03
|
|
||||||
+# System authorization information
|
|
||||||
+
|
|
||||||
+# Use CDROM installation media
|
|
||||||
+# Use graphical install
|
|
||||||
+# Run the Setup Agent on first boot
|
|
||||||
+# Keyboard layouts
|
|
||||||
+keyboard --vckeymap=us --xlayouts='us'
|
|
||||||
+# System language
|
|
||||||
+
|
|
||||||
+# Network information
|
|
||||||
+# Root password
|
|
||||||
+# System timezone
|
|
||||||
+timezone Asia/Shanghai --isUtc --nontp
|
|
||||||
+# System bootloader configuration
|
|
||||||
+# Partition clearing information
|
|
||||||
+
|
|
||||||
+%packages --multilib
|
|
||||||
+@core
|
|
||||||
+glibc.i686
|
|
||||||
+gcc
|
|
||||||
+gdb
|
|
||||||
+make
|
|
||||||
+%end
|
|
||||||
+
|
|
||||||
+%post
|
|
||||||
+grub2-set-default 1
|
|
||||||
+%end
|
|
||||||
diff --git a/isomaker/config/loongarch64/livecd/live/config_files/loongarch64/boot.msg b/isomaker/config/loongarch64/livecd/live/config_files/loongarch64/boot.msg
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..ff54899
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/isomaker/config/loongarch64/livecd/live/config_files/loongarch64/boot.msg
|
|
||||||
@@ -0,0 +1,5 @@
|
|
||||||
+
|
|
||||||
+splash.lss
|
|
||||||
+
|
|
||||||
+ - Press the 01<ENTER>07 key to begin the installation process.
|
|
||||||
+
|
|
||||||
diff --git a/isomaker/config/loongarch64/livecd/live/config_files/loongarch64/grub.conf b/isomaker/config/loongarch64/livecd/live/config_files/loongarch64/grub.conf
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..0077343
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/isomaker/config/loongarch64/livecd/live/config_files/loongarch64/grub.conf
|
|
||||||
@@ -0,0 +1,9 @@
|
|
||||||
+#debug --graphics
|
|
||||||
+default=0
|
|
||||||
+splashimage=@SPLASHPATH@
|
|
||||||
+timeout 60
|
|
||||||
+hiddenmenu
|
|
||||||
+title Start @PRODUCT@ @VERSION@
|
|
||||||
+ findiso
|
|
||||||
+ kernel @KERNELPATH@ @ROOT@ rd.live.ram net.ifnames=0 biosdevname=0 rd.shell=0
|
|
||||||
+ initrd @INITRDPATH@
|
|
||||||
diff --git a/isomaker/config/loongarch64/livecd/live/config_files/loongarch64/grub2-efi.cfg b/isomaker/config/loongarch64/livecd/live/config_files/loongarch64/grub2-efi.cfg
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..37ca171
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/isomaker/config/loongarch64/livecd/live/config_files/loongarch64/grub2-efi.cfg
|
|
||||||
@@ -0,0 +1,47 @@
|
|
||||||
+set default="1"
|
|
||||||
+
|
|
||||||
+function load_video {
|
|
||||||
+ if [ x$feature_all_video_module = xy ]; then
|
|
||||||
+ insmod all_video
|
|
||||||
+ else
|
|
||||||
+ insmod efi_gop
|
|
||||||
+ insmod efi_uga
|
|
||||||
+ insmod ieee1275_fb
|
|
||||||
+ insmod vbe
|
|
||||||
+ insmod vga
|
|
||||||
+ insmod video_bochs
|
|
||||||
+ insmod video_cirrus
|
|
||||||
+ fi
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+load_video
|
|
||||||
+set gfxpayload=keep
|
|
||||||
+insmod gzio
|
|
||||||
+insmod part_gpt
|
|
||||||
+insmod ext2
|
|
||||||
+insmod vfat
|
|
||||||
+
|
|
||||||
+set timeout=60
|
|
||||||
+### END /etc/grub.d/00_header ###
|
|
||||||
+
|
|
||||||
+search --no-floppy --set=root -l '@ISOLABEL@'
|
|
||||||
+
|
|
||||||
+### BEGIN /etc/grub.d/10_linux ###
|
|
||||||
+menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
|
|
||||||
+ linux @KERNELPATH@ @ROOT@ ro inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off fpi_to_tail=off
|
|
||||||
+ initrd @INITRDPATH@
|
|
||||||
+}
|
|
||||||
+menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
|
|
||||||
+ linux @KERNELPATH@ @ROOT@ rd.live.check inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off fpi_to_tail=off
|
|
||||||
+ initrd @INITRDPATH@
|
|
||||||
+}
|
|
||||||
+submenu 'Troubleshooting -->' {
|
|
||||||
+ menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os {
|
|
||||||
+ linux @KERNELPATH@ @ROOT@ nomodeset inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off fpi_to_tail=off
|
|
||||||
+ initrd @INITRDPATH@
|
|
||||||
+ }
|
|
||||||
+ menuentry 'Rescue the @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os {
|
|
||||||
+ linux @KERNELPATH@ @ROOT@ rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off fpi_to_tail=off
|
|
||||||
+ initrd @INITRDPATH@
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
diff --git a/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl b/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..cc318f4
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl
|
|
||||||
@@ -0,0 +1,75 @@
|
|
||||||
+<%page args="kernels, runtime_img, basearch, inroot, outroot, product, isolabel"/>
|
|
||||||
+<%
|
|
||||||
+configdir="tmp/config_files/loongarch64"
|
|
||||||
+PXEBOOTDIR="images/pxeboot"
|
|
||||||
+KERNELDIR=PXEBOOTDIR
|
|
||||||
+LORAXDIR="usr/share/lorax/"
|
|
||||||
+LIVEDIR="LiveOS"
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+from os.path import basename
|
|
||||||
+%>
|
|
||||||
+
|
|
||||||
+## Test ${runtime_img} to see if udf is needed
|
|
||||||
+<%
|
|
||||||
+ import os
|
|
||||||
+ from pylorax.sysutils import joinpaths
|
|
||||||
+ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
|
|
||||||
+ udfargs = "-allow-limited-size"
|
|
||||||
+ else:
|
|
||||||
+ udfargs = ""
|
|
||||||
+%>
|
|
||||||
+mkdir ${LIVEDIR}
|
|
||||||
+install ${runtime_img} ${LIVEDIR}/squashfs.img
|
|
||||||
+treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+## install kernels
|
|
||||||
+mkdir ${KERNELDIR}
|
|
||||||
+%for kernel in kernels:
|
|
||||||
+ ## normal loongarch64
|
|
||||||
+ installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
|
|
||||||
+ installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
|
|
||||||
+%endfor
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+## WHeeeeeeee, EFI.
|
|
||||||
+## We could remove the basearch restriction someday..
|
|
||||||
+<% efiargs=""; efigraft="" %>
|
|
||||||
+%if exists("boot/efi/EFI/*/grubloongarch64.efi"):
|
|
||||||
+ <%
|
|
||||||
+ efiarch32 = None
|
|
||||||
+ efiarch64 = 'LOONGARCH64'
|
|
||||||
+ efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
|
|
||||||
+ images = ["images/efiboot.img"]
|
|
||||||
+ %>
|
|
||||||
+ %for img in images:
|
|
||||||
+ <%
|
|
||||||
+ efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
|
|
||||||
+ efigraft += " {0}={1}/{0}".format(img,outroot)
|
|
||||||
+ %>
|
|
||||||
+ treeinfo images-${basearch} ${img|basename} ${img}
|
|
||||||
+ %endfor
|
|
||||||
+ <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/>
|
|
||||||
+%endif
|
|
||||||
+
|
|
||||||
+# Create optional product.img and updates.img
|
|
||||||
+<% filegraft=""; images=["product", "updates"] %>
|
|
||||||
+%for img in images:
|
|
||||||
+ %if exists("%s/%s/" % (LORAXDIR, img)):
|
|
||||||
+ installimg ${LORAXDIR}/${img}/ images/${img}.img
|
|
||||||
+ treeinfo images-${basearch} ${img}.img images/${img}.img
|
|
||||||
+ <% filegraft += " images/{0}.img={1}/images/{0}.img".format(img, outroot) %>
|
|
||||||
+ %endif
|
|
||||||
+%endfor
|
|
||||||
+
|
|
||||||
+%if exists("boot/efi/EFI/*/grubloongarch64.efi"):
|
|
||||||
+## make boot.iso
|
|
||||||
+runcmd mkisofs -o ${outroot}/images/boot.iso \
|
|
||||||
+ ${efiargs} -R -J -V '${isolabel}' -T ${udfargs} \
|
|
||||||
+ -graft-points \
|
|
||||||
+ ${KERNELDIR}=${outroot}/${KERNELDIR} \
|
|
||||||
+ ${LIVEDIR}=${outroot}/${LIVEDIR} \
|
|
||||||
+ ${efigraft} ${filegraft}
|
|
||||||
+treeinfo images-${basearch} boot.iso images/boot.iso
|
|
||||||
+%endif
|
|
||||||
diff --git a/isomaker/config/loongarch64/livecd/livecd_loongarch64.ks b/isomaker/config/loongarch64/livecd/livecd_loongarch64.ks
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..192c4b1
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/isomaker/config/loongarch64/livecd/livecd_loongarch64.ks
|
|
||||||
@@ -0,0 +1,70 @@
|
|
||||||
+# Minimal Disk Image
|
|
||||||
+#
|
|
||||||
+# Firewall configuration
|
|
||||||
+firewall --enabled
|
|
||||||
+# Use network installation
|
|
||||||
+url --url="INSTALL_REPO"
|
|
||||||
+# Root password
|
|
||||||
+rootpw --iscrypted ROOT_PWD
|
|
||||||
+
|
|
||||||
+# Network information
|
|
||||||
+network --bootproto=dhcp --onboot=on --activate
|
|
||||||
+# System keyboard
|
|
||||||
+keyboard --xlayouts=us --vckeymap=us
|
|
||||||
+# System language
|
|
||||||
+lang en_US.UTF-8
|
|
||||||
+# SELinux configuration
|
|
||||||
+selinux --enforcing
|
|
||||||
+# Installation logging level
|
|
||||||
+logging --level=info
|
|
||||||
+# Shutdown after installation
|
|
||||||
+shutdown
|
|
||||||
+# System timezone
|
|
||||||
+timezone Asia/Beijing
|
|
||||||
+# System bootloader configuration
|
|
||||||
+bootloader --location=mbr
|
|
||||||
+# Clear the Master Boot Record
|
|
||||||
+zerombr
|
|
||||||
+# Partition clearing information
|
|
||||||
+clearpart --all
|
|
||||||
+# Disk partitioning information
|
|
||||||
+part / --fstype="ext4" --size=40000
|
|
||||||
+part swap --size=1000
|
|
||||||
+%pre
|
|
||||||
+#!/bin/bash
|
|
||||||
+mkdir -p /mnt/sysimage/usr/lib64/
|
|
||||||
+chmod 0755 /mnt/sysimage/usr/lib64/
|
|
||||||
+cp /usr/lib64/libbep_env.so /mnt/sysimage/usr/lib64
|
|
||||||
+%end
|
|
||||||
+%post
|
|
||||||
+
|
|
||||||
+touch /etc/sysconfig/network
|
|
||||||
+
|
|
||||||
+cat << EOF > /etc/sysconfig/network-scripts/ifcfg-eth0
|
|
||||||
+TYPE=Ethernet
|
|
||||||
+BOOTPROTO=dhcp
|
|
||||||
+NAME=eth0
|
|
||||||
+DEVICE=eth0
|
|
||||||
+ONBOOT=yes
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+rm -rf /etc/systemd/system/multi-user.target.wants/kbox.service
|
|
||||||
+rm -rf /etc/systemd/system/multi-user.target.wants/kdump.service
|
|
||||||
+rm -rf /usr/lib/systemd/system/kbox.service
|
|
||||||
+rm -rf /usr/lib/systemd/system/kdump.service
|
|
||||||
+rm -rf /boot/initramfs*
|
|
||||||
+
|
|
||||||
+#fix shadows and shadows- time field
|
|
||||||
+awk 'BEGIN{FS=OFS=":"} {$3=18099; print $0 > "/etc/shadow"}' /etc/shadow;
|
|
||||||
+awk 'BEGIN{FS=OFS=":"} {$3=18099; print $0 > "/etc/shadow-"}' /etc/shadow-;
|
|
||||||
+
|
|
||||||
+#fix /etc/pki/ca-trust/extracted/java/cacerts time field
|
|
||||||
+rm /etc/pki/ca-trust/extracted/java/cacerts
|
|
||||||
+/usr/bin/ca-legacy install
|
|
||||||
+/usr/bin/update-ca-trust
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+%end
|
|
||||||
+
|
|
||||||
+%packages --excludedocs
|
|
||||||
+%end
|
|
||||||
diff --git a/isomaker/config/loongarch64/livecd/rpmlist b/isomaker/config/loongarch64/livecd/rpmlist
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..2eb4ac9
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/isomaker/config/loongarch64/livecd/rpmlist
|
|
||||||
@@ -0,0 +1,91 @@
|
|
||||||
+NetworkManager
|
|
||||||
+NetworkManager-config-server
|
|
||||||
+abattis-cantarell-fonts
|
|
||||||
+audit
|
|
||||||
+authselect
|
|
||||||
+basesystem
|
|
||||||
+bash
|
|
||||||
+bind
|
|
||||||
+bind-dnssec-utils
|
|
||||||
+boost-iostreams
|
|
||||||
+coreutils
|
|
||||||
+cronie
|
|
||||||
+cryptsetup
|
|
||||||
+curl
|
|
||||||
+dejavu-fonts
|
|
||||||
+dnf
|
|
||||||
+dnf-plugins-core
|
|
||||||
+dosfstools
|
|
||||||
+dracut-config-generic
|
|
||||||
+dracut-config-rescue
|
|
||||||
+dracut-live
|
|
||||||
+dracut-network
|
|
||||||
+e2fsprogs
|
|
||||||
+filesystem
|
|
||||||
+fipscheck
|
|
||||||
+firewalld
|
|
||||||
+glibc
|
|
||||||
+grub2-efi-loongarch64
|
|
||||||
+grub2-efi-loongarch64-cdboot
|
|
||||||
+grubby
|
|
||||||
+hostname
|
|
||||||
+initscripts
|
|
||||||
+ipmitool
|
|
||||||
+iproute
|
|
||||||
+iprutils
|
|
||||||
+iputils
|
|
||||||
+irqbalance
|
|
||||||
+kbd
|
|
||||||
+kernel
|
|
||||||
+kernel-tools
|
|
||||||
+kexec-tools
|
|
||||||
+less
|
|
||||||
+libX11
|
|
||||||
+libdaemon
|
|
||||||
+libnet
|
|
||||||
+libteam
|
|
||||||
+linux-firmware
|
|
||||||
+lshw
|
|
||||||
+lsscsi
|
|
||||||
+lvm2
|
|
||||||
+man-db
|
|
||||||
+ncurses
|
|
||||||
+net-snmp
|
|
||||||
+openEuler-latest-release
|
|
||||||
+openEuler-logos
|
|
||||||
+openEuler-release
|
|
||||||
+openssh
|
|
||||||
+openssh-clients
|
|
||||||
+openssh-server
|
|
||||||
+parted
|
|
||||||
+passwd
|
|
||||||
+policycoreutils
|
|
||||||
+procps-ng
|
|
||||||
+python3-decorator
|
|
||||||
+python3-ply
|
|
||||||
+python3-slip
|
|
||||||
+rdma-core
|
|
||||||
+rng-tools
|
|
||||||
+rootfiles
|
|
||||||
+rpm
|
|
||||||
+rsync
|
|
||||||
+rsyslog
|
|
||||||
+samba-client
|
|
||||||
+samba-libs
|
|
||||||
+security-tool
|
|
||||||
+selinux-policy-mls
|
|
||||||
+selinux-policy-targeted
|
|
||||||
+setup
|
|
||||||
+sg3_utils
|
|
||||||
+shadow
|
|
||||||
+sssd
|
|
||||||
+sudo
|
|
||||||
+sysfsutils
|
|
||||||
+systemd
|
|
||||||
+tuned
|
|
||||||
+unzip
|
|
||||||
+util-linux
|
|
||||||
+vim-minimal
|
|
||||||
+wget
|
|
||||||
+xfsprogs
|
|
||||||
+yum
|
|
||||||
--
|
|
||||||
2.43.0
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
From b1feb98d22f577432d226aeadfc0133b72104b3a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Wenlong Zhang <zhangwenlong@loongson.cn>
|
|
||||||
Date: Thu, 30 May 2024 09:40:38 +0000
|
|
||||||
Subject: [PATCH] add ls2k500sfb.ko for loongarch64
|
|
||||||
|
|
||||||
---
|
|
||||||
isomaker/80-openeuler/runtime-cleanup.tmpl | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/isomaker/80-openeuler/runtime-cleanup.tmpl b/isomaker/80-openeuler/runtime-cleanup.tmpl
|
|
||||||
index 256d013..8d4b423 100644
|
|
||||||
--- a/isomaker/80-openeuler/runtime-cleanup.tmpl
|
|
||||||
+++ b/isomaker/80-openeuler/runtime-cleanup.tmpl
|
|
||||||
@@ -106,7 +106,7 @@ removekmod sound drivers/media drivers/hwmon \
|
|
||||||
removekmod drivers/char --allbut virtio_console hw_random \
|
|
||||||
virtio-rng ipmi hmcdrv
|
|
||||||
removekmod drivers/hid --allbut hid-logitech-dj hid-logitech-hidpp
|
|
||||||
-removekmod drivers/video --allbut hyperv_fb syscopyarea sysfillrect sysimgblt fb_sys_fops
|
|
||||||
+removekmod drivers/video --allbut hyperv_fb syscopyarea sysfillrect sysimgblt fb_sys_fops ls2k500sfb
|
|
||||||
remove lib/modules/*/{build,source,*.map}
|
|
||||||
## NOTE: depmod gets re-run after cleanup finishes
|
|
||||||
|
|
||||||
--
|
|
||||||
2.43.0
|
|
||||||
|
|
||||||
@ -1,157 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE comps
|
|
||||||
PUBLIC '-//openEuler//DTD Comps info//EN'
|
|
||||||
'comps.dtd'>
|
|
||||||
<comps>
|
|
||||||
<group>
|
|
||||||
<id>core</id>
|
|
||||||
<name>Core</name>
|
|
||||||
<name xml:lang="zh_CN">核心</name>
|
|
||||||
<description>Smallest possible installation</description>
|
|
||||||
<description xml:lang="zh_CN">最小安装</description>
|
|
||||||
<default>true</default>
|
|
||||||
<uservisible>false</uservisible>
|
|
||||||
<packagelist>
|
|
||||||
<packagereq type="mandatory">audit</packagereq>
|
|
||||||
<packagereq type="mandatory">kernel</packagereq>
|
|
||||||
<packagereq type="mandatory">basesystem</packagereq>
|
|
||||||
<packagereq type="mandatory">bash</packagereq>
|
|
||||||
<packagereq type="mandatory">coreutils</packagereq>
|
|
||||||
<packagereq type="mandatory">cronie</packagereq>
|
|
||||||
<packagereq type="mandatory">curl</packagereq>
|
|
||||||
<packagereq type="mandatory">dnf</packagereq>
|
|
||||||
<packagereq type="mandatory">e2fsprogs</packagereq>
|
|
||||||
<packagereq type="mandatory">filesystem</packagereq>
|
|
||||||
<packagereq type="mandatory">firewalld</packagereq>
|
|
||||||
<packagereq type="mandatory">glibc</packagereq>
|
|
||||||
<packagereq type="mandatory">grubby</packagereq>
|
|
||||||
<packagereq type="mandatory">hostname</packagereq>
|
|
||||||
<packagereq type="mandatory">initscripts</packagereq>
|
|
||||||
<packagereq type="mandatory">iproute</packagereq>
|
|
||||||
<packagereq type="mandatory">iprutils</packagereq>
|
|
||||||
<packagereq type="mandatory">iputils</packagereq>
|
|
||||||
<packagereq type="mandatory">irqbalance</packagereq>
|
|
||||||
<packagereq type="mandatory">kbd</packagereq>
|
|
||||||
<packagereq type="mandatory">kexec-tools</packagereq>
|
|
||||||
<packagereq type="mandatory">less</packagereq>
|
|
||||||
<packagereq type="mandatory">man-db</packagereq>
|
|
||||||
<packagereq type="mandatory">ncurses</packagereq>
|
|
||||||
<packagereq type="mandatory">openssh</packagereq>
|
|
||||||
<packagereq type="mandatory">openssh-server</packagereq>
|
|
||||||
<packagereq type="mandatory">openssh-clients</packagereq>
|
|
||||||
<packagereq type="mandatory">openEuler-release</packagereq>
|
|
||||||
<packagereq type="mandatory">openEuler-latest-release</packagereq>
|
|
||||||
<packagereq type="mandatory">parted</packagereq>
|
|
||||||
<packagereq type="mandatory">passwd</packagereq>
|
|
||||||
<packagereq type="mandatory">policycoreutils</packagereq>
|
|
||||||
<packagereq type="mandatory">procps-ng</packagereq>
|
|
||||||
<packagereq type="mandatory">rng-tools</packagereq>
|
|
||||||
<packagereq type="mandatory">rootfiles</packagereq>
|
|
||||||
<packagereq type="mandatory">rpm</packagereq>
|
|
||||||
<packagereq type="mandatory">selinux-policy-targeted</packagereq>
|
|
||||||
<packagereq type="mandatory">setup</packagereq>
|
|
||||||
<packagereq type="mandatory">shadow</packagereq>
|
|
||||||
<packagereq type="mandatory">sssd</packagereq>
|
|
||||||
<packagereq type="mandatory">sudo</packagereq>
|
|
||||||
<packagereq type="mandatory">systemd</packagereq>
|
|
||||||
<packagereq type="mandatory">tuned</packagereq>
|
|
||||||
<packagereq type="mandatory">util-linux</packagereq>
|
|
||||||
<packagereq type="mandatory">vim-minimal</packagereq>
|
|
||||||
<packagereq type="mandatory">xfsprogs</packagereq>
|
|
||||||
<packagereq type="mandatory">yum</packagereq>
|
|
||||||
<packagereq type="mandatory">wget</packagereq>
|
|
||||||
<packagereq type="default">NetworkManager</packagereq>
|
|
||||||
<packagereq type="default">NetworkManager-config-server</packagereq>
|
|
||||||
<packagereq type="default">authselect</packagereq>
|
|
||||||
<packagereq type="default">dnf-plugins-core</packagereq>
|
|
||||||
<packagereq type="default">dracut-config-rescue</packagereq>
|
|
||||||
<packagereq type="default">kernel-tools</packagereq>
|
|
||||||
<packagereq type="default">sysfsutils</packagereq>
|
|
||||||
<packagereq type="default">linux-firmware</packagereq>
|
|
||||||
<packagereq type="default">lshw</packagereq>
|
|
||||||
<packagereq type="default">lsscsi</packagereq>
|
|
||||||
<packagereq type="default">rsyslog</packagereq>
|
|
||||||
<packagereq type="default">security-tool</packagereq>
|
|
||||||
<packagereq type="default">sg3_utils</packagereq>
|
|
||||||
<packagereq type="optional">dracut-config-generic</packagereq>
|
|
||||||
<packagereq type="optional">dracut-network</packagereq>
|
|
||||||
<packagereq type="optional">rdma-core</packagereq>
|
|
||||||
<packagereq type="optional">selinux-policy-mls</packagereq>
|
|
||||||
<packagereq type="default">patch</packagereq>
|
|
||||||
<packagereq type="default">patch-help</packagereq>
|
|
||||||
<packagereq type="default">ntp</packagereq>
|
|
||||||
<packagereq type="default">ntp-help</packagereq>
|
|
||||||
<packagereq type="default">ntp-perl</packagereq>
|
|
||||||
<packagereq type="default">iSulad</packagereq>
|
|
||||||
<packagereq type="default">tar</packagereq>
|
|
||||||
<packagereq type="default">socat</packagereq>
|
|
||||||
<packagereq type="default">socat-help</packagereq>
|
|
||||||
<packagereq type="default">conntrack-tools</packagereq>
|
|
||||||
<packagereq type="default">conntrack-tools-help</packagereq>
|
|
||||||
<packagereq type="optional">vim-X11</packagereq>
|
|
||||||
<packagereq type="default">vim-common</packagereq>
|
|
||||||
<packagereq type="optional">vim-enhanced</packagereq>
|
|
||||||
<packagereq type="optional">vim-filesystem</packagereq>
|
|
||||||
<packagereq type="optional">vim-minimal</packagereq>
|
|
||||||
<packagereq type="optional">efibootmgr</packagereq>
|
|
||||||
<packagereq type="optional">efibootmgr-help</packagereq>
|
|
||||||
<packagereq type="optional">cjson</packagereq>
|
|
||||||
<packagereq type="optional">cjson-devel</packagereq>
|
|
||||||
<packagereq type="optional">mosquitto</packagereq>
|
|
||||||
<packagereq type="optional">chrony</packagereq>
|
|
||||||
</packagelist>
|
|
||||||
</group>
|
|
||||||
<group>
|
|
||||||
<id>edge</id>
|
|
||||||
<name>Edge</name>
|
|
||||||
<name xml:lang="zh_CN">边缘场景</name>
|
|
||||||
<description>Package for edge scene</description>
|
|
||||||
<description xml:lang="zh_CN">边缘场景相关包</description>
|
|
||||||
<default>true</default>
|
|
||||||
<uservisible>false</uservisible>
|
|
||||||
<packagelist>
|
|
||||||
<packagereq type="default">kubernetes</packagereq>
|
|
||||||
<packagereq type="default">kubernetes-client</packagereq>
|
|
||||||
<packagereq type="default">kubernetes-help</packagereq>
|
|
||||||
<packagereq type="default">kubernetes-kubeadm</packagereq>
|
|
||||||
<packagereq type="default">kubernetes-kubelet</packagereq>
|
|
||||||
<packagereq type="default">kubernetes-master</packagereq>
|
|
||||||
<packagereq type="default">kubernetes-node</packagereq>
|
|
||||||
<packagereq type="default">kubeedge-cloudcore</packagereq>
|
|
||||||
<packagereq type="default">kubeedge-edgecore</packagereq>
|
|
||||||
<packagereq type="default">kubeedge-edgesite</packagereq>
|
|
||||||
<packagereq type="default">kubeedge-keadm</packagereq>
|
|
||||||
<packagereq type="default">mdadm</packagereq>
|
|
||||||
<packagereq type="default">mdadm-help</packagereq>
|
|
||||||
</packagelist>
|
|
||||||
</group>
|
|
||||||
<environment>
|
|
||||||
<id>minimal-environment</id>
|
|
||||||
<name>Minimal Install</name>
|
|
||||||
<name xml:lang="zh_CN">最小安装</name>
|
|
||||||
<description>Basic functionality.</description>
|
|
||||||
<description xml:lang="zh_CN">基本功能。</description>
|
|
||||||
<display_order>1</display_order>
|
|
||||||
<grouplist>
|
|
||||||
<groupid>core</groupid>
|
|
||||||
</grouplist>
|
|
||||||
<optionlist>
|
|
||||||
<groupid>standard</groupid>
|
|
||||||
</optionlist>
|
|
||||||
</environment>
|
|
||||||
<environment>
|
|
||||||
<id>edge-cloud-environment</id>
|
|
||||||
<name>Edge Cloud</name>
|
|
||||||
<name xml:lang="zh_CN">边缘云</name>
|
|
||||||
<description>For edge computing scenarios</description>
|
|
||||||
<description xml:lang="zh_CN">用于边缘计算场景</description>
|
|
||||||
<display_order>2</display_order>
|
|
||||||
<grouplist>
|
|
||||||
<groupid>core</groupid>
|
|
||||||
<groupid>edge</groupid>
|
|
||||||
</grouplist>
|
|
||||||
<optionlist>
|
|
||||||
<groupid>standard</groupid>
|
|
||||||
</optionlist>
|
|
||||||
</environment>
|
|
||||||
</comps>
|
|
||||||
1534
normal_ppc64le.xml
1534
normal_ppc64le.xml
File diff suppressed because it is too large
Load Diff
1546
normal_riscv64.xml
1546
normal_riscv64.xml
File diff suppressed because it is too large
Load Diff
Binary file not shown.
67
oemaker.spec
67
oemaker.spec
@ -15,7 +15,7 @@ Summary: a building tool for DVD ISO making and ISO cutting
|
|||||||
License: Mulan PSL v2
|
License: Mulan PSL v2
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
Version: 3.1.0
|
Version: 3.1.0
|
||||||
Release: 14
|
Release: 9
|
||||||
BuildRoot: %{_tmppath}/%{name}
|
BuildRoot: %{_tmppath}/%{name}
|
||||||
|
|
||||||
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
@ -29,11 +29,6 @@ Source7: desktop_normal_x86_64.xml
|
|||||||
Source8: normal_loongarch64.xml
|
Source8: normal_loongarch64.xml
|
||||||
Source9: rpmlist_loongarch64.xml
|
Source9: rpmlist_loongarch64.xml
|
||||||
Source10: desktop_normal_loongarch64.xml
|
Source10: desktop_normal_loongarch64.xml
|
||||||
Source11: rpmlist_riscv64.xml
|
|
||||||
Source12: normal_riscv64.xml
|
|
||||||
Source13: rpmlist_ppc64le.xml
|
|
||||||
Source14: normal_ppc64le.xml
|
|
||||||
Source15: edge_normal_ppc64le.xml
|
|
||||||
|
|
||||||
Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2 anaconda libselinux-utils
|
Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2 anaconda libselinux-utils
|
||||||
Requires: lorax >= 19.6.78-1
|
Requires: lorax >= 19.6.78-1
|
||||||
@ -41,16 +36,6 @@ Requires: lorax >= 19.6.78-1
|
|||||||
# Patch here
|
# Patch here
|
||||||
Patch0001: 0001-fix-createrepo-data-error.patch
|
Patch0001: 0001-fix-createrepo-data-error.patch
|
||||||
Patch0002: add-openEuler_repo.conf-for-loongarch64.patch
|
Patch0002: add-openEuler_repo.conf-for-loongarch64.patch
|
||||||
Patch0004: add-loongarch64-support-for-livecd.patch
|
|
||||||
Patch0005: add-ls2k500sfb.ko-for-loongarch64.patch
|
|
||||||
%ifarch ppc64le
|
|
||||||
Patch0006: 0001-init-support-for-arch-ppc64le.patch
|
|
||||||
Patch0007: 0002-add-config-for-arch-ppc64le.patch
|
|
||||||
Patch0008: 0003-add-support-for-ppc64le-runtime-install.patch
|
|
||||||
%endif
|
|
||||||
Patch0009: 0004-bugfix-IABY7K.patch
|
|
||||||
Patch0010: 0001-add-riscv64-support.patch
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
a building tool for DVD ISO making and ISO cutting
|
a building tool for DVD ISO making and ISO cutting
|
||||||
@ -96,25 +81,9 @@ rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/desktop_n
|
|||||||
cp %{SOURCE7} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/desktop_normal.xml
|
cp %{SOURCE7} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/desktop_normal.xml
|
||||||
rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/loongarch64/desktop_normal.xml
|
rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/loongarch64/desktop_normal.xml
|
||||||
cp %{SOURCE10} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/loongarch64/desktop_normal.xml
|
cp %{SOURCE10} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/loongarch64/desktop_normal.xml
|
||||||
%ifarch ppc64le
|
|
||||||
rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
|
|
||||||
cp %{SOURCE13} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
|
|
||||||
rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/ppc64le/normal.xml
|
|
||||||
cp %{SOURCE14} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/ppc64le/normal.xml
|
|
||||||
rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/ppc64le/edge_normal.xml
|
|
||||||
cp %{SOURCE15} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/ppc64le/edge_normal.xml
|
|
||||||
%endif
|
|
||||||
cd %{_builddir}/%{name}-%{version}/%{name}
|
cd %{_builddir}/%{name}-%{version}/%{name}
|
||||||
|
|
||||||
%autopatch -p1
|
%autopatch -p1
|
||||||
%ifarch riscv64
|
|
||||||
rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
|
|
||||||
cp %{SOURCE11} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
|
|
||||||
rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/normal.xml
|
|
||||||
cp %{SOURCE12} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/normal.xml
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
sys_arch=$(uname -m)
|
sys_arch=$(uname -m)
|
||||||
@ -140,9 +109,11 @@ install -m 700 %{name}/isomaker/rpm.sh %{buildroot}/opt/oemaker/rpm.sh
|
|||||||
install -m 700 %{name}/isomaker/env_record.sh %{buildroot}/opt/oemaker/env_record.sh
|
install -m 700 %{name}/isomaker/env_record.sh %{buildroot}/opt/oemaker/env_record.sh
|
||||||
install -m 700 %{name}/isomaker/env_restore.sh %{buildroot}/opt/oemaker/env_restore.sh
|
install -m 700 %{name}/isomaker/env_restore.sh %{buildroot}/opt/oemaker/env_restore.sh
|
||||||
install -m 400 %{name}/isomaker/config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml
|
install -m 400 %{name}/isomaker/config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml
|
||||||
|
%ifnarch loongarch64
|
||||||
install -m 640 %{name}/isomaker/config/${sys_arch}/livecd/live/config_files/${sys_arch}/* %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/live/config_files/${sys_arch}/
|
install -m 640 %{name}/isomaker/config/${sys_arch}/livecd/live/config_files/${sys_arch}/* %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/live/config_files/${sys_arch}/
|
||||||
install -m 400 %{name}/isomaker/config/${sys_arch}/livecd/livecd_${sys_arch}.ks %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/livecd_${sys_arch}.ks
|
install -m 400 %{name}/isomaker/config/${sys_arch}/livecd/livecd_${sys_arch}.ks %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/livecd_${sys_arch}.ks
|
||||||
install -m 600 %{name}/isomaker/config/${sys_arch}/livecd/rpmlist %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/rpmlist
|
install -m 600 %{name}/isomaker/config/${sys_arch}/livecd/rpmlist %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/rpmlist
|
||||||
|
%endif
|
||||||
install -m 400 %{name}/isomaker/config/${sys_arch}/desktop_normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/desktop_normal.xml
|
install -m 400 %{name}/isomaker/config/${sys_arch}/desktop_normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/desktop_normal.xml
|
||||||
install -m 400 %{name}/isomaker/config/${sys_arch}/edge_normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/edge_normal.xml
|
install -m 400 %{name}/isomaker/config/${sys_arch}/edge_normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/edge_normal.xml
|
||||||
install -m 400 %{name}/isomaker/config/${sys_arch}/normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/normal.xml
|
install -m 400 %{name}/isomaker/config/${sys_arch}/normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/normal.xml
|
||||||
@ -154,17 +125,9 @@ install -m 400 %{name}/isomaker/config/x86_64/ks.cfg %{buildroot}/opt/oemaker/co
|
|||||||
%ifarch aarch64
|
%ifarch aarch64
|
||||||
install -m 700 %{name}/isomaker/config/aarch64/livecd/live/aarch64.tmpl %{buildroot}/opt/oemaker/config/aarch64/livecd/live/aarch64.tmpl
|
install -m 700 %{name}/isomaker/config/aarch64/livecd/live/aarch64.tmpl %{buildroot}/opt/oemaker/config/aarch64/livecd/live/aarch64.tmpl
|
||||||
%endif
|
%endif
|
||||||
%ifarch loongarch64
|
%ifnarch loongarch64
|
||||||
install -m 700 %{name}/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl %{buildroot}/opt/oemaker/config/loongarch64/livecd/live/loongarch64.tmpl
|
|
||||||
install -m 400 %{name}/isomaker/config/loongarch64/ks.cfg %{buildroot}/opt/oemaker/config/loongarch64/ks.cfg
|
|
||||||
%endif
|
|
||||||
install -m 700 %{name}/isomaker/config/common/livecd/live/* %{buildroot}/opt/oemaker/config/common/livecd/live/
|
install -m 700 %{name}/isomaker/config/common/livecd/live/* %{buildroot}/opt/oemaker/config/common/livecd/live/
|
||||||
install -m 400 %{name}/isomaker/config/common/livecd/root_pwd %{buildroot}/opt/oemaker/config/common/livecd/root_pwd
|
install -m 400 %{name}/isomaker/config/common/livecd/root_pwd %{buildroot}/opt/oemaker/config/common/livecd/root_pwd
|
||||||
%ifarch riscv64
|
|
||||||
install -m 700 %{name}/isomaker/config/riscv64/livecd/live/riscv64.tmpl %{buildroot}/opt/oemaker/config/riscv64/livecd/live/riscv64.tmpl
|
|
||||||
%endif
|
|
||||||
%ifarch ppc64le
|
|
||||||
install -m 700 %{name}/isomaker/config/ppc64le/livecd/live/ppc64le.tmpl %{buildroot}/opt/oemaker/config/ppc64le/livecd/live/ppc64le.tmpl
|
|
||||||
%endif
|
%endif
|
||||||
install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/
|
install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/
|
||||||
cp -ar %{name}/isomaker/80-openeuler %{buildroot}/opt/oemaker/
|
cp -ar %{name}/isomaker/80-openeuler %{buildroot}/opt/oemaker/
|
||||||
@ -233,28 +196,6 @@ rm -rf %{buildroot}
|
|||||||
rm -rf $RPM_BUILD_DIR/%{name}
|
rm -rf $RPM_BUILD_DIR/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jul 16 2024 Ouuleilei <wangliu@iscas.ac.cn> - 3.1.0-14
|
|
||||||
- riscv64 rpmlist.xml exclude some packages, riscv64 normal.xml delete opengauss
|
|
||||||
- fix patch conflict
|
|
||||||
|
|
||||||
* Wed Jul 10 2024 wangchong <wangchong56@huawei.com> - 3.1.0-13
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC: fix issue IABY7K
|
|
||||||
|
|
||||||
* Mon Jun 24 2024 jiahua yu <jiahua.yu@shingroup.cn> - 3.1.0-12
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC: init support for arch ppc64le
|
|
||||||
|
|
||||||
* Wed May 29 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 3.1.0-11
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC: add livecd for loongarch64, add ls2k500sfb.ko for loongarch64
|
|
||||||
|
|
||||||
* Tue May 28 2024 Ouuleilei <wangliu@iscas.ac.cn> - 3.1.0-10
|
|
||||||
- add riscv64 support
|
|
||||||
|
|
||||||
* Tue May 21 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 3.1.0-9
|
* Tue May 21 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 3.1.0-9
|
||||||
- ID:NA
|
- ID:NA
|
||||||
- SUG:NA
|
- SUG:NA
|
||||||
|
|||||||
1405
rpmlist_ppc64le.xml
1405
rpmlist_ppc64le.xml
File diff suppressed because it is too large
Load Diff
1449
rpmlist_riscv64.xml
1449
rpmlist_riscv64.xml
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user