Skip to content

Commit

Permalink
profiles: don't use wildcard in accept_keywords for packages keyworde…
Browse files Browse the repository at this point in the history
…d for arm64

Most of entries in profiles/targets/rpi3/package.accept_keywords/*
specify value "* ~*", which means "package is visible if it is in stable
or testing status on any architecture".

This means, once any affected package gets a new ebuild having *any*
keyword, e.g. ~amd64, it becomes "visible" as a pending update for the
system. This is not a bad trick per se, especially for a deliberate
"bleeding edge" system, and especially in earlier times when arm64
didn't maintain a stable keyword. But this means potentially dealing
with more cases of breakage, because Gentoo staff hasn't yet assured
that the new version works on arm64 architecture.

This commit turns such lines, for packages which are keyworded for
arm64 (at least in unstable status, ~arm64), into lines with just the
package name, which means "package is visible if it is in stable or
testing status on *host* architecture". This means arm64 in this case.
It might lead to some confusion for people who are trying to use the
overlay for arm (32-bit) systems, but they don't seem to be the target
audience anyway. I am open to changing this commit to list arm64
explicitly.

The script used to produce the change:

    REPO=/usr/portage
    cat profiles/targets/rpi3/package.accept_keywords/* \
    | grep -v -E '^$|^#|^=' \
    | awk '{ print $1 }' \
    | sort -u \
    | while read CATPN; do
          if grep -q 'KEYWORDS=.*arm64' $REPO/$CATPN/*.ebuild &>/dev/null; then
    	  # Keyworded, stable or unstable
    	  # Replace '$CAT/$PN * ~*' which is 'accept stable or testing on any arch'
    	  # with '$CAT/$PN' which is 'accept testing on host arch'
    	  sed -i -e "s:^${CATPN}[ ]\+[*] [~][*]$:${CATPN}:" profiles/targets/rpi3/package.accept_keywords/*
          fi
      done
  • Loading branch information
Andrey Utkin committed Oct 3, 2019
1 parent 33301a0 commit f648cf5
Show file tree
Hide file tree
Showing 24 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/claws-mail
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ dev-libs/libdbusmenu * ~*
net-libs/libetpan * ~*
dev-libs/libindicate * ~*
x11-themes/sound-theme-freedesktop * ~*
net-mail/ytnef * ~*
net-mail/ytnef

2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/dav1d
Original file line number Diff line number Diff line change
@@ -1 +1 @@
media-libs/dav1d * ~*
media-libs/dav1d
2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/eudev
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sys-fs/eudev * ~*
sys-fs/eudev
2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/euses
Original file line number Diff line number Diff line change
@@ -1 +1 @@
app-portage/euses * ~*
app-portage/euses
2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/f2fs-tools
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sys-fs/f2fs-tools * ~*
sys-fs/f2fs-tools
10 changes: 5 additions & 5 deletions profiles/targets/rpi3/package.accept_keywords/firefox
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
www-client/firefox * ~*
www-client/firefox
# required by firefox
virtual/rust * ~*
virtual/rust
dev-util/cargo * ~*
app-eselect/eselect-rust * ~*
dev-lang/rust * ~*
dev-util/cbindgen * ~*
app-eselect/eselect-rust
dev-lang/rust
dev-util/cbindgen
12 changes: 6 additions & 6 deletions profiles/targets/rpi3/package.accept_keywords/gimp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
media-gfx/gimp * ~*
media-gfx/gimp
# requirements of gimp

media-libs/libmypaint * ~*
media-libs/gexiv2 * ~*
media-libs/babl * ~*
media-libs/gegl * ~*
media-gfx/mypaint-brushes * ~*
media-libs/libmypaint
media-libs/gexiv2
media-libs/babl
media-libs/gegl
media-gfx/mypaint-brushes
2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/gtk
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# required by gtk+ / gtk USE flag on certain packages (e.g. git)
dev-lang/mujs * ~*
dev-lang/mujs
2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/iw
Original file line number Diff line number Diff line change
@@ -1 +1 @@
net-wireless/iw * ~*
net-wireless/iw
2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/kodi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
=media-tv/kodi-18.0* * ~*
~media-tv/kodi-18.4 * ~*
# requirements of media-tv/kodi
sys-fs/udisks * ~*
sys-fs/udisks
dev-libs/crossguid * ~*
dev-libs/libfstrcmp * ~*
dev-libs/libfmt * ~*
Expand Down
4 changes: 2 additions & 2 deletions profiles/targets/rpi3/package.accept_keywords/libreoffice
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ dev-libs/libixion * ~*
app-text/liblangtag * ~*
dev-libs/xmlsec * ~*
dev-perl/X11-Protocol * ~*
app-text/libepubgen * ~*
app-text/libqxp * ~*
app-text/libepubgen
app-text/libqxp

2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/mc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
app-misc/mc * ~*
app-misc/mc
4 changes: 2 additions & 2 deletions profiles/targets/rpi3/package.accept_keywords/mirrorselect
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
app-portage/mirrorselect * ~*
app-portage/mirrorselect
# requirements of mirrorselect
net-analyzer/netselect * ~*
net-analyzer/netselect
4 changes: 2 additions & 2 deletions profiles/targets/rpi3/package.accept_keywords/mupdf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
app-text/mupdf * ~*
app-text/mupdf
# required by mupdf
media-libs/glfw * ~*
media-libs/glfw

2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/nasm
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dev-lang/nasm * ~*
dev-lang/nasm
2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/rng-tools
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sys-apps/rng-tools * ~*
sys-apps/rng-tools
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
xfce-extra/thunar-archive-plugin * ~*
# requirements of xfce-extra/thunar-archive-plugin
dev-libs/volume_key * ~*
dev-libs/libbytesize * ~*
sys-libs/libblockdev * ~*
dev-libs/volume_key
dev-libs/libbytesize
sys-libs/libblockdev
2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/thunderbird
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mail-client/thunderbird * ~*
# dependencies of thunderbird
media-plugins/gst-plugins-libav * ~*
media-plugins/gst-plugins-libav
2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/v4l-utils
Original file line number Diff line number Diff line change
@@ -1 +1 @@
media-tv/v4l-utils * ~*
media-tv/v4l-utils
8 changes: 4 additions & 4 deletions profiles/targets/rpi3/package.accept_keywords/virt-manager
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
app-emulation/virt-manager * ~*
# dependencies of virt-manager
app-emulation/spice-protocol * ~*
net-libs/gtk-vnc * ~*
dev-perl/Text-CSV * ~*
app-emulation/spice-protocol
net-libs/gtk-vnc
dev-perl/Text-CSV
net-misc/x11-ssh-askpass * ~*
net-misc/spice-gtk * ~*
net-misc/spice-gtk
app-emulation/libvirt-glib * ~*

2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/virtual-cron
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
virtual/cron * ~*
virtual/cron

6 changes: 3 additions & 3 deletions profiles/targets/rpi3/package.accept_keywords/vlc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
media-video/vlc * ~*
media-video/vlc
# required by vlc
media-video/ffmpeg * ~*
media-libs/xvid * ~*
media-video/ffmpeg
media-libs/xvid
media-libs/x264 * ~*
Original file line number Diff line number Diff line change
@@ -1 +1 @@
x11-drivers/xf86-input-synaptics * ~*
x11-drivers/xf86-input-synaptics
2 changes: 1 addition & 1 deletion profiles/targets/rpi3/package.accept_keywords/xorg-server
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# get most modern version
x11-base/xorg-server * ~*
x11-base/xorg-server

0 comments on commit f648cf5

Please sign in to comment.