Skip to content
Snippets Groups Projects

samsung-i9100: Change arch to armv7

Merged Imported Administrator requested to merge i9100-armv7 into master
All threads resolved!

Update the samsung-i9100 arch from armhf to armv7.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Administrator added 1 commit · Imported

    added 1 commit

    • b352dfa1 - samsung-i9100: Change arch to armv7

    Compare with previous version

    By Paul Cercueil on 2020-03-18T12:08:27

  • Administrator approved this merge request · Imported

    approved this merge request

    By Minecrell on 2020-03-18T12:13:40

  • Author Owner

    @pcercuei thanks for your MR! Please fix the linting issue while you're at it:

    Linting issues found:
    firmware/firmware-samsung-i9100/APKBUILD: MC:[AL5]:firmware/firmware-samsung-i9100/APKBUILD:23:variable set to empty string: source=""

    By Bart Ribbers on 2020-03-18T12:37:27

  • Author Owner

    @PureTryOut the APKBUILD does:

    source=""
    for _i in $_files; do
       source="$source $pkgname-$_commit-$_i::$_url/$_i";
    done

    So can source="" be removed if it's used later in the loop?

    By Paul Cercueil on 2020-03-20T11:02:13

    • Author Owner
      Resolved by Administrator

      This line was not changed in this MR. I suggest to:

      1. either leave it as is, with linter warning
      2. or, do not use loop to fill sources variable at all. Instead of
      # Source
      _files="
      	bcmdhd_apsta.bin
      	bcmdhd_mfg.bin
      	bcmdhd_p2p.bin
      	bcmdhd_sta.bin
      	nvram_mfg.txt
      	nvram_mfg.txt_murata
      	nvram_net.txt
      	nvram_net.txt_murata
      "

      use directly

      _url="https://github.com/TheMuppets/proprietary_vendor_samsung/raw/$_commit/i9100/proprietary/system/etc/wifi"
      source="
      	$pkgname-$_commit-bcmdhd_apsta.bin::$_url/bcmdhd_apsta.bin
      	$pkgname-$_commit-bcmdhd_mfg.bin::$_url/bcmdhd_mfg.bin
      	...bcmdhd_p2p.bin
      	...bcmdhd_sta.bin
      	...nvram_mfg.txt
      	...nvram_mfg.txt_murata
      	...nvram_net.txt
      	$pkgname-$_commit-nvram_net.txt_murata::$_urlnvram_net.txt_murata
      "

      ... without loops, in other words in line $pkgname-$_commit-$_i::$_url/$_i replace all $_i with each file name.

      By Alexey Min on 2020-03-20T12:20:50

      Edited by Ghost User
  • Administrator approved this merge request · Imported

    approved this merge request

    By Oliver Smith on 2020-03-21T20:55:36

  • Administrator added 44 commits · Imported

    added 44 commits

    Compare with previous version

    By Oliver Smith on 2020-03-21T20:56:19

  • Administrator resolved all threads · Imported

    resolved all threads

    By Oliver Smith on 2020-03-21T20:56:35

  • Author Owner

    So can source="" be removed if it's used later in the loop?

    Yep. I've removed the line, the loop is still working as it should.

    Thanks for the patch, @pcercuei!

    By Oliver Smith on 2020-03-21T20:58:19

  • Administrator enabled an automatic merge when the pipeline for 72702212 succeeds · Imported

    enabled an automatic merge when the pipeline for 72702212 succeeds

    By Oliver Smith on 2020-03-21T20:58:39

  • Administrator added 1 commit · Imported

    added 1 commit

    Compare with previous version

    By Oliver Smith on 2020-03-21T21:00:20

  • Administrator enabled an automatic merge when the pipeline for b14dcd09 succeeds · Imported

    enabled an automatic merge when the pipeline for b14dcd09 succeeds

    By Oliver Smith on 2020-03-21T21:00:38

  • Administrator merged · Imported

    merged

    By Oliver Smith on 2020-03-21T21:02:15

  • Administrator mentioned in commit b14dcd09 · Imported

    mentioned in commit b14dcd09

    By Paul Cercueil on 2020-03-26T14:57:49

Please register or sign in to reply
Loading