diff options
| author | Kyle K <kylek389@gmail.com> | 2020-05-01 10:08:17 -0500 |
|---|---|---|
| committer | Kyle K <kylek389@gmail.com> | 2020-05-01 10:08:17 -0500 |
| commit | cef766f62ba6758d600e2715c43f3dee301f114a (patch) | |
| tree | efb320254c5c9ce818e19f1145c07183da81dc1f | |
| parent | 34c929ee19e04df384774fffe9e7d6342390ba11 (diff) | |
| download | gentoox-cef766f62ba6758d600e2715c43f3dee301f114a.tar.gz gentoox-cef766f62ba6758d600e2715c43f3dee301f114a.tar.bz2 gentoox-cef766f62ba6758d600e2715c43f3dee301f114a.zip | |
fix build-stage3.sh, gentoo's releng had upstream changes
| -rw-r--r-- | 0001-releng-gcc-add-graphite-support.patch | 32 | ||||
| -rw-r--r-- | ToDo.txt | 29 | ||||
| -rwxr-xr-x | build-stage3.sh | 15 | ||||
| -rwxr-xr-x | gentoox_build.sh | 6 |
4 files changed, 58 insertions, 24 deletions
diff --git a/0001-releng-gcc-add-graphite-support.patch b/0001-releng-gcc-add-graphite-support.patch index 7803788..20a5be8 100644 --- a/0001-releng-gcc-add-graphite-support.patch +++ b/0001-releng-gcc-add-graphite-support.patch @@ -4,42 +4,42 @@ Date: Thu, 2 Jan 2020 11:13:46 -0600 Subject: [PATCH] gcc: add graphite support --- - releases/weekly/portage/isos/package.accept_keywords/gcc | 1 + - releases/weekly/portage/isos/package.use/gcc | 1 + - releases/weekly/portage/stages/package.accept_keywords/gcc | 1 + - releases/weekly/portage/stages/package.use/gcc | 1 + + releases/portage/isos/package.accept_keywords/gcc | 1 + + releases/portage/isos/package.use/gcc | 1 + + releases/portage/stages/package.accept_keywords/gcc | 1 + + releases/portage/stages/package.use/gcc | 1 + 4 files changed, 4 insertions(+) - create mode 100644 releases/weekly/portage/isos/package.accept_keywords/gcc - create mode 100644 releases/weekly/portage/isos/package.use/gcc - create mode 100644 releases/weekly/portage/stages/package.accept_keywords/gcc - create mode 100644 releases/weekly/portage/stages/package.use/gcc + create mode 100644 releases/portage/isos/package.accept_keywords/gcc + create mode 100644 releases/portage/isos/package.use/gcc + create mode 100644 releases/portage/stages/package.accept_keywords/gcc + create mode 100644 releases/portage/stages/package.use/gcc -diff --git a/releases/weekly/portage/isos/package.accept_keywords/gcc b/releases/weekly/portage/isos/package.accept_keywords/gcc +diff --git a/releases/portage/isos/package.accept_keywords/gcc b/releases/portage/isos/package.accept_keywords/gcc new file mode 100644 index 00000000..e30528a1 --- /dev/null -+++ b/releases/weekly/portage/isos/package.accept_keywords/gcc ++++ b/releases/portage/isos/package.accept_keywords/gcc @@ -0,0 +1 @@ +dev-libs/isl -diff --git a/releases/weekly/portage/isos/package.use/gcc b/releases/weekly/portage/isos/package.use/gcc +diff --git a/releases/portage/isos/package.use/gcc b/releases/portage/isos/package.use/gcc new file mode 100644 index 00000000..da4356e2 --- /dev/null -+++ b/releases/weekly/portage/isos/package.use/gcc ++++ b/releases/portage/isos/package.use/gcc @@ -0,0 +1 @@ +sys-devel/gcc graphite -diff --git a/releases/weekly/portage/stages/package.accept_keywords/gcc b/releases/weekly/portage/stages/package.accept_keywords/gcc +diff --git a/releases/portage/stages/package.accept_keywords/gcc b/releases/portage/stages/package.accept_keywords/gcc new file mode 100644 index 00000000..e30528a1 --- /dev/null -+++ b/releases/weekly/portage/stages/package.accept_keywords/gcc ++++ b/releases/portage/stages/package.accept_keywords/gcc @@ -0,0 +1 @@ +dev-libs/isl -diff --git a/releases/weekly/portage/stages/package.use/gcc b/releases/weekly/portage/stages/package.use/gcc +diff --git a/releases/portage/stages/package.use/gcc b/releases/portage/stages/package.use/gcc new file mode 100644 index 00000000..da4356e2 --- /dev/null -+++ b/releases/weekly/portage/stages/package.use/gcc ++++ b/releases/portage/stages/package.use/gcc @@ -0,0 +1 @@ +sys-devel/gcc graphite -- @@ -46,3 +46,32 @@ https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox https://github.com/bmwiedemann/openSUSE/tree/master/packages/m/MozillaFirefox http://bazaar.launchpad.net/~mozillateam/firefox/firefox-trunk.head/changes https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=firefox-kde-opensuse + + + + + + + +[May Release] +ToDo: +change headline: "mention that GentooX is bleeding edge, aka ~amd64" +FAQ: +-add note that Secure Boot has to be disabled +-fix 'overly' spelling typo +-fix "follow see" typo in FAQ +-merge back FAQ from website (if any) back to README.md +-recommend automatic partitioning, clarify how GentooX takes over whole drive + +-do not build AVX +-KWinFT? +-handle NVMe +-add Konsole transparency +-have Discover handle flatpak +-test drive installing nvidia blob +-what about llvm10? + + +- original idea was for GentooX OS files to be read-only, and user apps would + only be installed via flatpak, freebsd like system separation, GentooX would be updatable via binary delta files, + thanks to CoW feature of BTRFS, you would be able to e.g. boot April or May release of GentooX diff --git a/build-stage3.sh b/build-stage3.sh index f073223..bce49f3 100755 --- a/build-stage3.sh +++ b/build-stage3.sh @@ -17,15 +17,18 @@ if [[ ! -f .catalyst-prep-done ]]; then touch .catalyst-prep-done fi -cp -v releng/releases/weekly/specs/amd64/stage{1,2,3}.spec . +cp -v releng/releases/specs/amd64/stage{1,2,3}.spec . -sed -i "s/version_stamp: latest/version_stamp: $version_stamp/" stage1.spec +sed -i "s/version_stamp: @TIMESTAMP@/version_stamp: $version_stamp/" stage1.spec +sed -i "s/snapshot: @TIMESTAMP@/snapshot: latest/" stage1.spec sed -i "s#@REPO_DIR@#$(pwd)/releng#g" stage1.spec -sed -i "s/version_stamp: latest/version_stamp: $version_stamp/" stage2.spec -sed -i "s/source_subpath: default\/stage1-amd64-latest/source_subpath: default\/stage1-amd64-$version_stamp/" stage2.spec +sed -i "s/version_stamp: @TIMESTAMP@/version_stamp: $version_stamp/" stage2.spec +sed -i "s/snapshot: @TIMESTAMP@/snapshot: latest/" stage2.spec +sed -i "s/source_subpath: default\/stage1-amd64-@TIMESTAMP@/source_subpath: default\/stage1-amd64-$version_stamp/" stage2.spec sed -i "s#@REPO_DIR@#$(pwd)/releng#g" stage2.spec -sed -i "s/version_stamp: latest/version_stamp: $version_stamp/" stage3.spec -sed -i "s/source_subpath: default\/stage2-amd64-latest/source_subpath: default\/stage2-amd64-$version_stamp/" stage3.spec +sed -i "s/version_stamp: @TIMESTAMP@/version_stamp: $version_stamp/" stage3.spec +sed -i "s/snapshot: @TIMESTAMP@/snapshot: latest/" stage3.spec +sed -i "s/source_subpath: default\/stage2-amd64-@TIMESTAMP@/source_subpath: default\/stage2-amd64-$version_stamp/" stage3.spec sed -i "s#@REPO_DIR@#$(pwd)/releng#g" stage3.spec catalyst -f stage1.spec diff --git a/gentoox_build.sh b/gentoox_build.sh index c9fc779..86c0740 100755 --- a/gentoox_build.sh +++ b/gentoox_build.sh @@ -22,9 +22,9 @@ rootpassword=gentoox username=gentoox userpassword=gentoox #builddate="$(date +%Y%m%d).graphite" -builddate="20200425.graphite" +builddate="20200501.graphite" #builddir="build-$(date +%Y%m%d)" -builddir="build-20200425" +builddir="build-20200501" KERNEL_CONFIG_DIFF="0001-kernel-config-cfs-r4.patch" binpkgs=/root/var/cache/binpkgs/ @@ -177,6 +177,7 @@ dev-db/sqlite secure-delete x11-base/xorg-server xvfb sys-apps/xdg-desktop-portal screencast dev-vcs/git tk +dev-libs/libjcat pkcs7 gpg dev-libs/libdbusmenu gtk3' > /etc/portage/package.use/gentoox rm -rf /etc/portage/package.accept_keywords/ @@ -324,6 +325,7 @@ sed -i '1s/^/NTHREADS="12"\n/' /etc/portage/make.conf echo -e '\nkde-plasma/plasma-meta discover networkmanager thunderbolt kde-apps/kio-extras samba +sed -i "s/DBUILD_FlatpakBackend=OFF/DBUILD_FlatpakBackend=ON/" /var/db/repos/gentoo/kde-plasma/discover/discover-5.18.4.1.ebuild media-video/vlc archive bluray dav1d libcaca live opus speex theora vaapi vdpau x265 gnome-base/gvfs afp archive bluray fuse gphoto2 ios mtp nfs samba zeroconf' >> /etc/portage/package.use/gentoox emerge -v --jobs=4 --keep-going=y --autounmask=y --autounmask-write=y --deep --newuse kde-plasma/plasma-meta kde-apps/kde-apps-meta kde-apps/kmail kde-apps/knotes latte-dock calamares gparted plasma-sdk gdb atop dos2unix qt-creator libdbusmenu gvfs firefox adobe-flash mpv app-misc/screen audacious-plugins audacious net-irc/hexchat |