packages/oemaker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change for issue I3DJJW

Browse Source
This commit is contained in:
miao_kaibo 2021-04-07 19:16:45 +08:00
parent f42544a70c
commit 6adf299e91
11 changed files with 4838 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
0001-change-source-iso-method.patch
View File

@ -1,92 +0,0 @@
From d2181a8bd05e2761827f0cc9451992d137828095 Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Wed, 10 Mar 2021 09:16:00 +0800
Subject: [PATCH] change source iso method
---
config/rpmlist.xml | 11 +++++++++++
rpm.sh | 21 +++++++++++++--------
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/config/rpmlist.xml b/config/rpmlist.xml
index d5fcf8a..a6ac01b 100644
--- a/config/rpmlist.xml
+++ b/config/rpmlist.xml
@@ -32,6 +32,17 @@
<packagereq>texlive-scheme-gust</packagereq>
<packagereq>texlive-scheme-medium</packagereq>
<packagereq>texlive-scheme-tetex</packagereq>
+ <packagereq>totem</packagereq>
+ <packagereq>gimp</packagereq>
+ <packagereq>python3-nni</packagereq>
+ <packagereq>ceph-mgr-rook</packagereq>
+ <packagereq>ceph-mgr-ssh</packagereq>
+ <packagereq>ceph-mgr-dashboard</packagereq>
+ <packagereq>ceph-mgr-k8sevents</packagereq>
+ </packagelist>
+ <packagelist type="src_exclude">
+ <packagereq>totem</packagereq>
+ <packagereq>gimp</packagereq>
</packagelist>
<packagelist type="aarch64">
<packagereq>edk2-aarch64</packagereq>
diff --git a/rpm.sh b/rpm.sh
index 7e4a7e2..f8cf92e 100755
--- a/rpm.sh
+++ b/rpm.sh
@@ -154,7 +154,7 @@ function get_everything_rpms()
if [ -s parsed_rpmlist_exclude ];then
for rpmname in $(cat parsed_rpmlist_exclude)
do
- sed -i "/^${rpmname}/d" ava_every_lst
+ sed -i "/^${rpmname}\./d" ava_every_lst
done
fi
if [ -s conflict_list ];then
@@ -165,7 +165,7 @@ function get_everything_rpms()
if [ -s parsed_rpmlist_conflict ];then
for rpmname in $(cat parsed_rpmlist_conflict)
do
- sed -i "/^${rpmname}/d" ava_every_lst
+ sed -i "/^${rpmname}\./d" ava_every_lst
echo "${rpmname}" >> conflict_list
done
fi
@@ -174,7 +174,7 @@ function get_everything_rpms()
if [ -s parsed_rpmlist_everything_conflict ];then
for rpmname in $(cat parsed_rpmlist_everything_conflict)
do
- sed -i "/^${rpmname}/d" ava_every_lst
+ sed -i "/^${rpmname}\./d" ava_every_lst
echo "${rpmname}" >> conflict_list
done
fi
@@ -197,15 +197,20 @@ function everything_rpms_download()
function everything_source_rpms_download()
{
mkdir ${EVERY_SRC_DIR}
- get_everything_rpms
- yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat ava_every_lst | tr '\n' ' ')
+ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep ".src" > ava_every_lst
+ parse_rpmlist_xml "src_exclude"
+ cat parsed_rpmlist_src_exclude
+ if [ -s parsed_rpmlist_src_exclude ];then
+ for rpmname in $(cat parsed_rpmlist_src_exclude)
+ do
+ sed -i "/^${rpmname}\./d" ava_every_lst
+ done
+ fi
+ yumdownloader --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat ava_every_lst | tr '\n' ' ')
if [ $? != 0 ] || [ $(ls ${EVERY_SRC_DIR} | wc -l) == 0 ]; then
echo "Download rpms failed!"
exit 133
fi
- if [ -s conflict_list ];then
- yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat conflict_list | tr '\n' ' ')
- fi
}
function everything_debug_rpms_download()
--
2.27.0

12
0004-rename-source-iso.patch → 0001-rename-source-iso.patch
View File

@ -1,16 +1,16 @@
From 9693dae6c8173bb7277fa150e1a262a7f5d984e3 Mon Sep 17 00:00:00 2001
From e11a1ff002fdc7aab81f40b99fcea2fc86eba85b Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Fri, 2 Apr 2021 11:04:14 +0800
Date: Fri, 2 Apr 2021 10:23:47 +0800
Subject: [PATCH] rename source iso
---
init.sh | 4 ++--
isomaker/init.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/init.sh b/init.sh
diff --git a/isomaker/init.sh b/isomaker/init.sh
index f708555..2603bfb 100755
--- a/init.sh
+++ b/init.sh
--- a/isomaker/init.sh
+++ b/isomaker/init.sh
@@ -112,7 +112,7 @@ function global_var_init()
DBG_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-debug-${ARCH}-dvd.iso"
EVE_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-${ARCH}-dvd.iso"

25
0002-bug-fix-I3B7CH.patch
View File

@ -1,25 +0,0 @@
From 78879f08b31ea910e7b39b512a74986788645769 Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Sat, 13 Mar 2021 10:11:53 +0800
Subject: [PATCH] bug fix I3B7CH
---
rpm.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rpm.sh b/rpm.sh
index 7e4a7e2..9a255a7 100755
--- a/rpm.sh
+++ b/rpm.sh
@@ -148,7 +148,7 @@ function get_rpm_pub_key()
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
--
2.27.0

53
0003-remove-atlas.patch
View File

@ -1,53 +0,0 @@
From c07e8a605f00b822add5e7f55c1f2b8227fa65f0 Mon Sep 17 00:00:00 2001
From: yeah_wang <wangye70@huawei.com>
Date: Fri, 26 Mar 2021 14:05:35 +0800
Subject: [PATCH] remove atlas
---
config/aarch64/normal.xml | 2 --
config/x86_64/normal.xml | 2 --
2 files changed, 4 deletions(-)
diff --git a/config/aarch64/normal.xml b/config/aarch64/normal.xml
index cab5406..f4a031b 100644
--- a/config/aarch64/normal.xml
+++ b/config/aarch64/normal.xml
@@ -12,7 +12,6 @@
<default>true</default>
<uservisible>false</uservisible>
<packagelist>
- <packagereq type="mandatory">atlas-devel</packagereq>
<packagereq type="mandatory">audit-libs-devel</packagereq>
<packagereq type="mandatory">bzip2-devel</packagereq>
<packagereq type="mandatory">c-ares-devel</packagereq>
@@ -1187,7 +1186,6 @@
<default>true</default>
<uservisible>true</uservisible>
<packagelist>
- <packagereq type="optional">atlas</packagereq>
<packagereq type="optional">units</packagereq>
<packagereq type="optional">fftw</packagereq>
<packagereq type="optional">fftw-devel</packagereq>
diff --git a/config/x86_64/normal.xml b/config/x86_64/normal.xml
index 4ef88de..1c9dd8a 100644
--- a/config/x86_64/normal.xml
+++ b/config/x86_64/normal.xml
@@ -12,7 +12,6 @@
<default>true</default>
<uservisible>false</uservisible>
<packagelist>
- <packagereq type="mandatory">atlas-devel</packagereq>
<packagereq type="mandatory">audit-libs-devel</packagereq>
<packagereq type="mandatory">bzip2-devel</packagereq>
<packagereq type="mandatory">c-ares-devel</packagereq>
@@ -1188,7 +1187,6 @@
<default>true</default>
<uservisible>true</uservisible>
<packagelist>
- <packagereq type="optional">atlas</packagereq>
<packagereq type="optional">units</packagereq>
<packagereq type="optional">fftw</packagereq>
<packagereq type="optional">fftw-devel</packagereq>
--
1.8.3.1

69
0005-add-rpms-to-rpmlist-which-will-be-deleted-from-iso.patch
View File

@ -1,69 +0,0 @@
From d2f9f5097b96ad52bdfc1857a1c3f9047a490393 Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Wed, 7 Apr 2021 10:45:44 +0800
Subject: [PATCH] add rpms to rpmlist which will be deleted from iso
---
config/rpmlist.xml | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/config/rpmlist.xml b/config/rpmlist.xml
index a6ac01b..6222a42 100644
--- a/config/rpmlist.xml
+++ b/config/rpmlist.xml
@@ -20,18 +20,24 @@
<packagereq>texlive-collection-mathscience</packagereq>
<packagereq>texlive-collection-latexextra</packagereq>
<packagereq>texlive-collection-fontsextra</packagereq>
+ <packagereq>texlive-crossrefware</packagereq>
<packagereq>texlive-ctanupload</packagereq>
<packagereq>texlive-exceltex</packagereq>
<packagereq>texlive-latexindent</packagereq>
<packagereq>texlive-biblatex-apa</packagereq>
+ <packagereq>texlive-bibtexperllibs</packagereq>
<packagereq>texlive-collection-binextra</packagereq>
<packagereq>texlive-collection-fontutils</packagereq>
<packagereq>texlive-includernw</packagereq>
<packagereq>texlive-oldstandard</packagereq>
+ <packagereq>texlive-pdfpc-movie</packagereq>
<packagereq>texlive-scheme-full</packagereq>
<packagereq>texlive-scheme-gust</packagereq>
<packagereq>texlive-scheme-medium</packagereq>
<packagereq>texlive-scheme-tetex</packagereq>
+ <packagereq>wildfly-core</packagereq>
+ <packagereq>wildfly-core-javadoc</packagereq>
+ <packagereq>wildfly-core-feature-pack</packagereq>
<packagereq>totem</packagereq>
<packagereq>gimp</packagereq>
<packagereq>python3-nni</packagereq>
@@ -39,6 +45,27 @@
<packagereq>ceph-mgr-ssh</packagereq>
<packagereq>ceph-mgr-dashboard</packagereq>
<packagereq>ceph-mgr-k8sevents</packagereq>
+ <packagereq>dbus-c++-devel</packagereq>
+ <packagereq>gnome-software</packagereq>
+ <packagereq>gnome-software-devel</packagereq>
+ <packagereq>gnome-software-editor</packagereq>
+ <packagereq>gnome-software-help</packagereq>
+ <packagereq>ironjacamar</packagereq>
+ <packagereq>maven-plugins-pom</packagereq>
+ <packagereq>metrics-jdbi</packagereq>
+ <packagereq>nodejs-bunker</packagereq>
+ <packagereq>nodejs-lru-queue</packagereq>
+ <packagereq>nodejs-timers-ext</packagereq>
+ <packagereq>nodejs-grunt-contrib-internal</packagereq>
+ <packagereq>obs-api-testsuite-deps</packagereq>
+ <packagereq>pcp-collector</packagereq>
+ <packagereq>rubygem-activestorage-doc</packagereq>
+ <packagereq>rubygem-pry-nav-doc</packagereq>
+ <packagereq>rubygem-rails</packagereq>
+ <packagereq>rubygem-rspec-help</packagereq>
+ <packagereq>rubygem-rspec-rails-help</packagereq>
+ <packagereq>rubygem-rspec2-doc-</packagereq>
+ <packagereq>rubygem-selenium-webdriver-doc-</packagereq>
</packagelist>
<packagelist type="src_exclude">
<packagereq>totem</packagereq>
--
2.30.0

1665
normal_aarch64.xml Normal file
View File

File diff suppressed because it is too large Load Diff

1667
normal_x86_64.xml Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
oemaker-1.1.2.tar.gz
View File

Binary file not shown.

BIN
oemaker-2.0.0.tar.gz Normal file
View File

Binary file not shown.

107
oemaker.spec
View File

@ -1,26 +1,48 @@
%ifarch aarch64
%global efi_aa64 1
%endif
%ifarch x86_64
%global efi_x64 1
%endif
Name: oemaker
Summary: a duilding tool for making DVD ISO
Summary: a duilding tool for DVD ISO making and ISO cutting
License: Mulan PSL v2
Group: System/Management
Version: 1.1.2
Release: 8
Version: 2.0.0
Release: 1
BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildArch: noarch
Source1: normal_aarch64.xml
Source2: normal_x86_64.xml
Source3: rpmlist.xml
Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2
Requires: lorax >= 19.6.78-1
Patch0001: 0001-change-source-iso-method.patch
Patch0002: 0002-bug-fix-I3B7CH.patch
Patch0003: 0003-remove-atlas.patch
Patch0004: 0004-rename-source-iso.patch
Patch0005: 0005-add-rpms-to-rpmlist-which-will-be-deleted-from-iso.patch
Patch0001: 0001-rename-source-iso.patch
%description
a building tool for making DVD ISO
a building tool for DVD ISO making and ISO cutting
%package -n isocut
Summary: a building tool for ISO cutting
Requires: yum dnf-utils createrepo file util-linux genisoimage isomd5sum grep bash libselinux-utils libxml2
BuildRequires: bash
%description -n isocut
a building tool for ISO cutting
%prep
%setup -c
rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/normal.xml
cp %{SOURCE1} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/normal.xml
rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/normal.xml
cp %{SOURCE2} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/normal.xml
rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
cp %{SOURCE3} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
cd %{_builddir}/%{name}-%{version}/%{name}
%autopatch -p1
@ -31,38 +53,66 @@ mkdir -p %{buildroot}/opt/oemaker/config
mkdir -p %{buildroot}/opt/oemaker/config/x86_64
mkdir -p %{buildroot}/opt/oemaker/config/aarch64
mkdir -p %{buildroot}/opt/oemaker/docs
mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/%{_sysconfdir}/isocut
chmod 750 %{buildroot}/%{_sysconfdir}/isocut
cd %{name}
install -m 700 oemaker.sh %{buildroot}/opt/oemaker/oemaker.sh
install -m 700 make_debug.sh %{buildroot}/opt/oemaker/make_debug.sh
install -m 700 img_repo.sh %{buildroot}/opt/oemaker/img_repo.sh
install -m 700 init.sh %{buildroot}/opt/oemaker/init.sh
install -m 700 iso.sh %{buildroot}/opt/oemaker/iso.sh
install -m 700 rpm.sh %{buildroot}/opt/oemaker/rpm.sh
install -m 400 config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml
install -m 400 config/x86_64/* %{buildroot}/opt/oemaker/config/x86_64/
install -m 400 config/aarch64/* %{buildroot}/opt/oemaker/config/aarch64/
install -m 700 docs/* %{buildroot}/opt/oemaker/docs/
cp -a 80-openeuler %{buildroot}/opt/oemaker/
cd -
install -m 700 %{name}/isomaker/oemaker.sh %{buildroot}/opt/oemaker/oemaker.sh
install -m 700 %{name}/isomaker/oemaker.sh %{buildroot}/%{_bindir}/oemaker
install -m 700 %{name}/isomaker/make_debug.sh %{buildroot}/opt/oemaker/make_debug.sh
install -m 700 %{name}/isomaker/img_repo.sh %{buildroot}/opt/oemaker/img_repo.sh
install -m 700 %{name}/isomaker/init.sh %{buildroot}/opt/oemaker/init.sh
install -m 700 %{name}/isomaker/iso.sh %{buildroot}/opt/oemaker/iso.sh
install -m 700 %{name}/isomaker/rpm.sh %{buildroot}/opt/oemaker/rpm.sh
install -m 400 %{name}/isomaker/config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml
install -m 400 %{name}/isomaker/config/x86_64/* %{buildroot}/opt/oemaker/config/x86_64/
install -m 400 %{name}/isomaker/config/aarch64/* %{buildroot}/opt/oemaker/config/aarch64/
install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/
cp -a %{name}/isomaker/80-openeuler %{buildroot}/opt/oemaker/
install -m 550 %{name}/isocut/isocut.py %{buildroot}/%{_bindir}/isocut
install -m 600 %{name}/isocut/config/repodata.template %{buildroot}/%{_sysconfdir}/isocut/
%if 0%{?efi_aa64}
install -m 600 %{name}/isocut/config/aarch64/rpmlist %{buildroot}/%{_sysconfdir}/isocut/
install -m 600 %{name}/isocut/config/aarch64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/
%endif
%if 0%{?efi_x64}
install -m 600 %{name}/isocut/config/x86_64/rpmlist %{buildroot}/%{_sysconfdir}/isocut/
install -m 600 %{name}/isocut/config/x86_64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/
%endif
%pre
%post
ln -s /opt/oemaker/oemaker.sh /bin/oemaker
%preun
%postun
rm -r /bin/oemaker
rm -rf /opt/oemaker
%postun -n isocut
if [ "$1" = "0" ]; then
rm -rf %{_sysconfdir}/isocut/*
fi
%files
%defattr(-,root,root)
%dir /opt
%dir /opt/oemaker
/opt/oemaker/*
%{_bindir}/oemaker
%files -n isocut
%defattr(-,root,root)
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/repodata.template
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/rpmlist
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/anaconda-ks.cfg
%{_bindir}/isocut
%dir %{_sysconfdir}/isocut
%{_sysconfdir}/isocut/*
%clean
rm -rf $RPM_BUILD_ROOT/*
@ -70,6 +120,11 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}
%changelog
* Wen Apr 7 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-1
- ID:NA
- SUG:NA
- DESC: change for issue I3DJJW
* Wen Apr 7 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-8
- ID:NA
- SUG:NA

1419
rpmlist.xml Normal file
View File

File diff suppressed because it is too large Load Diff