Skip to content

Conversation

@syslogic
Copy link

@syslogic syslogic commented Jul 11, 2024

The *.spec files already produce these RPM packages:

cuttlefish-base-0.9.29-1.el9.x86_64.rpm
cuttlefish-user-0.9.29-1.el9.x86_64.rpm
cuttlefish-integration-0.9.29-1.el9.x86_64.rpm
cuttlefish-orchestration-0.9.29-1.el9.x86_64.rpm

I'd probably would need more information, eg. what to build with bazel
and also, which packages are even required and which files to package.

@syslogic syslogic changed the title rpmbuild support for base & user. RPMbuild Support Jul 11, 2024
@syslogic syslogic requested a review from ikicha as a code owner July 11, 2024 17:38
@syslogic
Copy link
Author

It seems to work so far, just needs more testing on the target system.
Had to edit the init-script, because there is no command rh_status.

This is the command, which I use for testing the package-scripts ...

sudo dnf -y remove cuttlefish-* && \
tools/buildutils/build_packages.sh && \
sudo rpm -i ./tools/rpmbuild/RPMS/x86_64/cuttlefish-base-0.9.29-1.el9.x86_64.rpm \
./tools/rpmbuild/RPMS/x86_64/cuttlefish-user-0.9.29-1.el9.x86_64.rpm \
./tools/rpmbuild/RPMS/x86_64/cuttlefish-orchestration-0.9.29-1.el9.x86_64.rpm \
./tools/rpmbuild/RPMS/x86_64/cuttlefish-integration-0.9.29-1.el9.x86_64.rpm

@daedroza
Copy link

Hi, do you plan to rebase the current changes on current HEAD?

@syslogic syslogic requested review from a team, cjreynol and ser-io as code owners March 14, 2025 13:05
@syslogic
Copy link
Author

syslogic commented Mar 14, 2025

@daedroza That wasn't such a great idea, because it only has caused a mess, when accidentally merging. Might try later on a Linux machine, where I still have a pristine version and can actually test the scripts. This will probably be a new PR, with the commits squashed into one then. The amount of files changed somehow doesn't look good.

@daedroza
Copy link

Thanks - I've rebased your changes here on my personal fork: https://github.com/daedroza/android-cuttlefish/commits/rpmbuild

But I haven't gotten time to test as I'm waiting for F42 release. Hopefully it works out of the box! With your force push I see more changes, the diff is too big for me to review.

@syslogic
Copy link
Author

syslogic commented Mar 16, 2025

@daedroza I'm going to start over with a new branch and then PR, to get rid of the conflicts.
My mistake was, that I didn't sync the remote fork first and then also pressed the wrong button.

#942

@syslogic syslogic closed this Mar 16, 2025
@syslogic syslogic deleted the rpmbuild branch March 16, 2025 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants