Drop ebuild patches
None of these are necessary anymore. They do not apply cleanly to current versions of ebuilds in Gentoo's repository, causing builds to fail. Going forward, I think it will be better to maintain patched ebuilds in the Aimee OS repository, rather than patching them at build time.gentoo
parent
70771c8067
commit
26b422ed74
3
Makefile
3
Makefile
|
@ -8,8 +8,7 @@ update.tar: $(IMAGESDIR)/update.tar.zstd
|
|||
|
||||
$(O)/.prepared: \
|
||||
prepare.sh \
|
||||
setup-local-repo.sh \
|
||||
$(shell find patches/ebuilds -type f)
|
||||
setup-local-repo.sh
|
||||
./prepare.sh
|
||||
./setup-local-repo.sh
|
||||
mkdir -p $(O)
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/conmon-2.1.6.ebuild 2023-03-16 15:02:17.213375763 -0000
|
||||
+++ b/conmon-2.1.6.ebuild 2023-03-16 15:02:46.337375763 -0000
|
||||
@@ -34,7 +34,7 @@
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
- tc-export CC
|
||||
+ tc-export CC PKG_CONFIG
|
||||
emake GIT_COMMIT="v${PV}" \
|
||||
all
|
||||
}
|
|
@ -1,13 +0,0 @@
|
|||
--- a/podman-4.4.1.ebuild 2023-03-22 01:23:44.252387512 -0000
|
||||
+++ b/podman-4.4.1.ebuild 2023-03-22 01:36:23.424387512 -0000
|
||||
@@ -37,8 +37,8 @@
|
||||
selinux? ( sys-libs/libselinux:= )
|
||||
"
|
||||
DEPEND="
|
||||
- ${COMMON_DEPEND}
|
||||
- dev-go/go-md2man"
|
||||
+ ${COMMON_DEPEND}"
|
||||
+BDEPEND="dev-go/go-md2man"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
fuse? ( sys-fs/fuse-overlayfs )
|
||||
selinux? ( sec-policy/selinux-podman )"
|
|
@ -1,11 +0,0 @@
|
|||
--- a/podman-4.4.1-r1.ebuild 2023-03-23 16:15:10.845405285 -0000
|
||||
+++ b/podman-4.4.1-r1.ebuild 2023-03-23 16:15:54.433405285 -0000
|
||||
@@ -60,6 +60,8 @@
|
||||
has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
|
||||
|
||||
sed "${makefile_sed_args[@]}" -i Makefile || die
|
||||
+
|
||||
+ tc-export CC LD
|
||||
}
|
||||
|
||||
src_compile() {
|
|
@ -1,14 +0,0 @@
|
|||
diff -ruN a/grub-2.06-r5.ebuild b/grub-2.06-r5.ebuild
|
||||
--- a/grub-2.06-r5.ebuild 2023-02-07 10:43:00.106060206 -0600
|
||||
+++ b/grub-2.06-r5.ebuild 2023-02-07 10:43:21.884298259 -0600
|
||||
@@ -128,10 +128,6 @@
|
||||
ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
- kernel_linux? (
|
||||
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
|
||||
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
|
||||
- )
|
||||
!sys-boot/grub:0
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
|
@ -12,32 +12,3 @@ cat > "${CONFIGDIR}"/portage/target/etc/portage/repos.conf/aimee-os.conf <<EOF
|
|||
location = ${PWD}/repos/aimee-os
|
||||
auto-sync = no
|
||||
EOF
|
||||
|
||||
cat > "${CONFIGDIR}"/portage/target/etc/portage/repos.conf/x-portage.conf <<EOF
|
||||
[x-portage]
|
||||
location = ${PWD}/repos/x-portage
|
||||
auto-sync = no
|
||||
EOF
|
||||
|
||||
find repos/x-portage \
|
||||
-mindepth 1 \
|
||||
-maxdepth 1 \
|
||||
-type d \
|
||||
-not -name metadata \
|
||||
-not -name profiles \
|
||||
| xargs rm -rfv
|
||||
|
||||
for patch in patches/ebuilds/*/*/*.patch; do
|
||||
[ -f "${patch}" ] || continue
|
||||
cp=${patch#patches/ebuilds/}
|
||||
cp=${cp%/*.patch}
|
||||
printf 'Applying patch %s for %s ...\n' "${patch##*/}" "${cp}"
|
||||
if [ ! -d repos/x-portage/${cp} ]; then
|
||||
mkdir -p repos/x-portage/${cp}
|
||||
cp -r /var/db/repos/gentoo/${cp}/. repos/x-portage/${cp}
|
||||
fi
|
||||
for f in repos/x-portage/${cp}/*.ebuild; do
|
||||
patch "${f}" "${patch}"
|
||||
ebuild "${f}" digest
|
||||
done
|
||||
done
|
||||
|
|
Loading…
Reference in New Issue