Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RPi add RPi and RPi2 devices #1358

Merged
merged 3 commits into from Mar 14, 2017

Conversation

@lrusak
Copy link
Member

commented Feb 16, 2017

This allows us to remove a lot of redundant code.

requires #1356

RPi projects will now have to be built with:

PROJECT=RPi DEVICE=RPi2 ARCH=arm make
PROJECT=RPi DEVICE=RPi ARCH=arm make
TARGET_CPU="arm1176jzf-s"
elif [ "$DEVICE" = "RPi2" ]; then
TARGET_CPU="cortex-a7"
fi

This comment has been minimized.

Copy link
@kszaq

kszaq Feb 17, 2017

Contributor

Why not define TARGET_CPU in projects/RPi/device/*/options?

This comment has been minimized.

Copy link
@lrusak

lrusak Feb 28, 2017

Author Member

I actually considered this, however then you have more dangling files to manage.

@lrusak

This comment has been minimized.

Copy link
Member Author

commented Feb 28, 2017

would be nice to get this in before it diverges too much

@lrusak lrusak force-pushed the lrusak:rpi-devices branch from 123e941 to 0302b8b Feb 28, 2017
@lrusak

This comment has been minimized.

Copy link
Member Author

commented Feb 28, 2017

rebased.

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

commented Mar 1, 2017

Can you rebase again (after #1400) - thanks!

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

commented Mar 1, 2017

Before merging we'll need to work out a solution for the compatibility check, also if there are any custom update channel changes needed. I'll look into both and ping you any changes.

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

commented Mar 1, 2017

I think this patch will allow old project-only systems to upgrade: http://sprunge.us/iDiW

However this does assume that "LIBREELEC_ARCH" in /etc/os-release will be <project>.<device>.<arch> which it currently is not. Changing this variable could conceivably have implications elsewhere (auto-update etc.) but it has to change because <project>.<arch> when building for a device is no longer accurate/useful (and is in fact, dangerous).

Downgrading from a project/device system to a project-only system will not be possible without the use of .nocompat, unless we add a canupdate.sh to libreelec-8.0 that allows for such a thing... it would essentially be the reverse of the above, ie.: http://sprunge.us/OjFM (Slice/Slice3 may want this too for libreelec-8.0).

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

commented Mar 1, 2017

This patch will set OPENELEC_ARCH and LIBREELEC_ARCH to appropriate values when building for a device: http://sprunge.us/HSaB

Unless you can think of a better/more appropriate solution?

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

commented Mar 1, 2017

For now, unless you can think of any issues, I'd recommend:

  1. Add http://sprunge.us/iDiW to this PR
  2. Add http://sprunge.us/OjFM to libreelec-8.0 before 8.0.1 (I can do that if nobody objects - whoever is responsible for Slice will need it also)
  3. Add http://sprunge.us/HSaB to this PR, but backend changes may also be required (auto-update, custom update).

However, having seen your proposed changes in #1356 and #1357, if you're happy to drop PROJECT from the build directory and also LIBREELEC_ARCH, then you can disregard 1, 2 and 3 above - this is all good. :)

@lrusak lrusak force-pushed the lrusak:rpi-devices branch from 0302b8b to d9395ff Mar 10, 2017
@lrusak

This comment has been minimized.

Copy link
Member Author

commented Mar 10, 2017

rebased

@lrusak lrusak force-pushed the lrusak:rpi-devices branch from d9395ff to 9df1449 Mar 14, 2017
@lrusak

This comment has been minimized.

Copy link
Member Author

commented Mar 14, 2017

rebased and good to go after #1356

lrusak added 3 commits Mar 14, 2017
@lrusak lrusak force-pushed the lrusak:rpi-devices branch from 9df1449 to 3d2e302 Mar 14, 2017
@lrusak

This comment has been minimized.

Copy link
Member Author

commented Mar 14, 2017

rebased

@MilhouseVH MilhouseVH merged commit f878c5a into LibreELEC:master Mar 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.