Skip to content
Permalink
Browse files

Handle pkgbuilds with an unsupported arch

When pkgbuilds are built by makepkg, if the pkgbuild's arch=() array
does not include the current carch set in makepkg.conf, makepkg will
fail to build the package.

Now, Yay detects if a pkgbuild does not support the arch set in
pacman.conf Yay will ask the user about this and ask them if they want
to build anyway, passing `--ignorearch` to makepkg.`

Note that Yay will check against the arch set in pacman.conf which is
what pacman uses to only allow installs of package of that arch. makepkg
will still use carch set in makepkg.conf to build packages. These two
values are expected to be the same otherwise Yay will fail.

The on disk .srcinfo is needed for this as the user should be asked pre
source download. This and pgp checking both use the on disk .srcinfo so
it is no longer a one off. Store the 'stale' srcinfos so they can be
accesed by both functions.
  • Loading branch information...
Morganamilo committed Mar 19, 2018
1 parent 1a15511 commit 4bcd3a6297052714e91e3f886602ce5c12d15786
Showing with 81 additions and 30 deletions.
  1. +77 −22 install.go
  2. +4 −8 keys.go
@@ -16,13 +16,15 @@ import (

// Install handles package installs
func install(parser *arguments) error {
removeMake := false
requestTargets := parser.targets.toSlice()
aurTargets, repoTargets, err := packageSlices(requestTargets)
if err != nil {
return err
}

var incompatable stringSet
removeMake := false
srcinfosStale := make(map[string]*gopkg.PKGBUILD)
srcinfos := make(map[string]*gopkg.PKGBUILD)
var dc *depCatagories

@@ -200,36 +202,47 @@ func install(parser *arguments) error {
uask := alpm.QuestionType(ask) | alpm.QuestionTypeConflictPkg
cmdArgs.globals["ask"] = fmt.Sprint(uask)

//this downloads the package build sources but also causes
//a version bumb for vsc packages
//that should not edit the sources so we should be safe to skip
//it and parse the srcinfo at the current version
//inital srcinfo parse before pkgver() bump
err = parsesrcinfosFile(dc.Aur, srcinfosStale, dc.Bases)
if err != nil {
return err
}

if arguments.existsArg("gendb") {
err = parsesrcinfosFile(dc.Aur, srcinfos, dc.Bases)
if err != nil {
return err
for _, pkg := range dc.Aur {
pkgbuild := srcinfosStale[pkg.PackageBase]

for _, pkg := range dc.Bases[pkg.PackageBase] {
updateVCSData(pkg.Name, pkgbuild.Source)
}
}

fmt.Println(bold(green(arrow + " GenDB finished. No packages were installed")))
return nil
}

err = checkPgpKeys(dc.Aur, dc.Bases)
incompatable, err = getIncompatable(dc.Aur, srcinfosStale, dc.Bases)
if err != nil {
return err
}

err = downloadPkgBuildsSources(dc.Aur, dc.Bases)

err = checkPgpKeys(dc.Aur, dc.Bases, srcinfosStale)
if err != nil {
return err
}

err = parsesrcinfosGenerate(dc.Aur, srcinfos, dc.Bases)
err = downloadPkgBuildsSources(dc.Aur, dc.Bases, incompatable)
if err != nil {
return err
}

err = buildInstallPkgBuilds(dc.Aur, srcinfos, parser.targets, parser, dc.Bases)
err = parsesrcinfosGenerate(dc.Aur, srcinfos, dc.Bases)
if err != nil {
return err
}

err = buildInstallPkgBuilds(dc.Aur, srcinfos, parser.targets, parser, dc.Bases, incompatable)
if err != nil {
return err
}
@@ -266,6 +279,41 @@ func install(parser *arguments) error {
return nil
}

func getIncompatable(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, bases map[string][]*rpc.Pkg) (stringSet, error) {
incompatable := make(stringSet)
alpmArch, err := alpmHandle.Arch()
if err != nil {
return nil, err
}

nextpkg:
for _, pkg := range pkgs {
for _, arch := range srcinfos[pkg.PackageBase].Arch {
if arch == "any" || arch == alpmArch {
continue nextpkg
}
}

incompatable.set(pkg.PackageBase)
}

if len(incompatable) > 0 {
fmt.Print(
bold(green(("\nThe following packages are not compatable with your architecture:"))))
for pkg := range incompatable {
fmt.Print(" " + cyan(pkg))
}

fmt.Println()

if !continueTask("Try to build them anyway?", "nN") {
return nil, fmt.Errorf("Aborting due to user")
}
}

return incompatable, nil
}

func cleanEditNumberMenu(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, installed stringSet) ([]*rpc.Pkg, []*rpc.Pkg, error) {
toPrint := ""
askClean := false
@@ -502,12 +550,7 @@ func parsesrcinfosFile(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, bas
return fmt.Errorf("%s: %s", pkg.Name, err)
}

srcinfos[pkg.PackageBase] = pkgbuild

for _, pkg := range bases[pkg.PackageBase] {
updateVCSData(pkg.Name, pkgbuild.Source)
}

srcinfos[pkg.PackageBase] = pkgbuild
}

return nil
@@ -571,10 +614,16 @@ func downloadPkgBuilds(pkgs []*rpc.Pkg, targets stringSet, bases map[string][]*r
return nil
}

func downloadPkgBuildsSources(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg) (err error) {
func downloadPkgBuildsSources(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, incompatable stringSet) (err error) {
for _, pkg := range pkgs {
dir := config.BuildDir + pkg.PackageBase + "/"
err = passToMakepkg(dir, "--nobuild", "--nocheck", "--noprepare", "--nodeps")
args := []string{"--nobuild", "--nocheck", "--noprepare", "--nodeps"}

if incompatable.get(pkg.PackageBase) {
args = append(args, "--ignorearch")
}

err = passToMakepkg(dir, args...)
if err != nil {
return fmt.Errorf("Error downloading sources: %s", formatPkgbase(pkg, bases))
}
@@ -583,7 +632,7 @@ func downloadPkgBuildsSources(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg) (err
return
}

func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, targets stringSet, parser *arguments, bases map[string][]*rpc.Pkg) error {
func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, targets stringSet, parser *arguments, bases map[string][]*rpc.Pkg, incompatable stringSet) error {
alpmArch, err := alpmHandle.Arch()
if err != nil {
return err
@@ -622,7 +671,13 @@ func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD,
fmt.Println(bold(red(arrow+" Warning:")),
pkg.Name+"-"+pkg.Version+" Already made -- skipping build")
} else {
err := passToMakepkg(dir, "-Ccf", "--noconfirm")
args := []string{"-Ccf", "--noconfirm"}

if incompatable.get(pkg.PackageBase) {
args = append(args, "--ignorearch")
}

err := passToMakepkg(dir, args...)
if err != nil {
return fmt.Errorf("Error making: %s", pkg.Name)
}
12 keys.go
@@ -5,7 +5,6 @@ import (
"fmt"
"os"
"os/exec"
"path"
"strings"

rpc "github.com/mikkeloscar/aur"
@@ -42,21 +41,17 @@ func (set pgpKeySet) get(key string) bool {

// checkPgpKeys iterates through the keys listed in the PKGBUILDs and if needed,
// asks the user whether yay should try to import them.
func checkPgpKeys(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg) error {
func checkPgpKeys(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD) error {
// Let's check the keys individually, and then we can offer to import
// the problematic ones.
problematic := make(pgpKeySet)
args := append(strings.Fields(config.GpgFlags), "--list-keys")

// Mapping all the keys.
for _, pkg := range pkgs {
srcinfo := path.Join(config.BuildDir, pkg.PackageBase, ".SRCINFO")
pkgbuild, err := gopkg.ParseSRCINFO(srcinfo)
if err != nil {
return fmt.Errorf("%s: %s", pkg.Name, err)
}
srcinfo := srcinfos[pkg.PackageBase]

for _, key := range pkgbuild.Validpgpkeys {
for _, key := range srcinfo.Validpgpkeys {
// If key already marked as problematic, indicate the current
// PKGBUILD requires it.
if problematic.get(key) {
@@ -77,6 +72,7 @@ func checkPgpKeys(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg) error {
return nil
}

fmt.Println()
question, err := formatKeysToImport(problematic, bases)
if err != nil {
return err

0 comments on commit 4bcd3a6

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.