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.

Sign up for GitHub

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

Add Leap 15.3 profiles for x86_64 & Aarch64 (#46) #48

Merged
merged 3 commits into from
Apr 28, 2021
Merged

Add Leap 15.3 profiles for x86_64 & Aarch64 (#46) #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3de8bb
Add Leap 15.3 profile for x86_64 & Aarch64 (#46)
phillxnet Apr 26, 2021
32d088d
Add readme "In-Development Profiles" header with Leap 15.3 entries (#46)
phillxnet Apr 27, 2021
c404527
Add missing profile references for Leap15.3.RaspberryPi4 (#46)
phillxnet Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ We can make no promises for the 'supported' status of any additional profiles bu
- **Leap15.2.RaspberryPi4**
- **Leap15.2.ARM64EFI**

## In-Development Profiles
- **Leap15.3.x86_64** (potential for Rockstor 4 're-launch')
- **Leap15.3.RaspberryPi4**
- **Leap15.3.ARM64EFI** (N.B. Ten64 compatibility awaiting mcbridematt repo update)

#### Raspberry Pi4 Notes:
As we are attempting to stick as closely as possible to upstream, and have limited resources, this installer requires
the recent Raspberry OS initiated firmware updates and associated /boot files copied over to enable USB boot.
Expand Down
2 changes: 1 addition & 1 deletion config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ sed -i 's/https:\/\/www.opensuse.org/http:\/\/rockstor.com/g' /usr/lib/os-releas
# Configure Raspberry Pi specifics
# from: https://build.opensuse.org/package/view_file/openSUSE:Factory:ToTest/kiwi-templates-JeOS/config.sh
#--------------------------------------
if [[ "$kiwi_profiles" == *"Leap15.2.RaspberryPi4"* ]]; then
if [[ "$kiwi_profiles" == *"Leap15.2.RaspberryPi4"* ]] || [[ "$kiwi_profiles" == *"Leap15.3.RaspberryPi4"* ]]; then
# Also show WLAN interfaces in /etc/issue
baseUpdateSysConfig /etc/sysconfig/issue-generator NETWORK_INTERFACE_REGEX '^[bew]'

Expand Down
83 changes: 66 additions & 17 deletions rockstor.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,22 @@ which includes aarch64 relevant content -->
<profile name="Leap15.2.ARM64EFI"
description="Rockstor built on openSUSE Leap 15.2 ARM64 EFI/VM/Ten64"
arch="aarch64"/>
<profile name="Leap15.3.x86_64"
description="Rockstor built on openSUSE Leap 15.3 x86_64"
arch="x86_64"/>
<profile name="Leap15.3.RaspberryPi4"
description="Rockstor built on openSUSE Leap 15.3 Raspberry_Pi"
arch="aarch64"/>
<profile name="Leap15.3.ARM64EFI"
description="Rockstor built on openSUSE Leap 15.3 ARM64 EFI/VM/Ten64"
arch="aarch64"/>
<!-- Tumbleweed.x86_64 profile currently broken due to now missing python2 dependencies -->
<!-- maintaining for use testing Python 3 migration within testing channel -->
<profile name="Tumbleweed.x86_64"
description="Rockstor built on openSUSE Tumbleweed x86_64"
arch="x86_64"/>
</profiles>
<preferences profiles="Leap15.2.x86_64,Tumbleweed.x86_64">
<preferences profiles="Leap15.2.x86_64,Leap15.3.x86_64,Tumbleweed.x86_64">
<!--Change to reflect the Rockstor version used #.#.# (rpm version) -# (rpm release)-->
<version>4.0.4-0</version>
<packagemanager>zypper</packagemanager>
Expand Down Expand Up @@ -94,7 +103,7 @@ which includes aarch64 relevant content -->
</type>
</preferences>

<preferences profiles="Leap15.2.RaspberryPi4">
<preferences profiles="Leap15.2.RaspberryPi4,Leap15.3.RaspberryPi4">
<!--Change to reflect the Rockstor version used #.#.# (rpm version) -# (rpm release)-->
<version>4.0.4-0</version>
<packagemanager>zypper</packagemanager>
Expand Down Expand Up @@ -145,7 +154,7 @@ which includes aarch64 relevant content -->
</oemconfig>
</type>
</preferences>
<preferences profiles="Leap15.2.ARM64EFI">
<preferences profiles="Leap15.2.ARM64EFI,Leap15.3.ARM64EFI">
<!--Change to reflect the Rockstor version used #.#.# (rpm version) -# (rpm release)-->
<version>4.0.4-0</version>
<packagemanager>zypper</packagemanager>
Expand Down Expand Up @@ -208,10 +217,16 @@ which includes aarch64 relevant content -->
name="root" groups="root"/>
</users>
<!-- For zypper priority 1 is highest, priority 0 returns to default of 99 -->
<!-- https://build.opensuse.org/project/show/Virtualization:Appliances:Builder -->
<repository type="rpm-md" alias="kiwi" priority="1"
profiles="Leap15.2.x86_64">
<source path="obs://Virtualization:Appliances:Builder/openSUSE_Leap_15.2"/>
</repository>
<!-- Leap 15.3 repo now dual architecture -->
<repository type="rpm-md" alias="kiwi" priority="1"
profiles="Leap15.3.x86_64,Leap15.3.RaspberryPi4,Leap15.3.ARM64EFI">
<source path="obs://Virtualization:Appliances:Builder/openSUSE_Leap_15.3"/>
</repository>
<repository type="rpm-md" alias="kiwi" priority="1"
profiles="Leap15.2.RaspberryPi4,Leap15.2.ARM64EFI">
<source path="obs://Virtualization:Appliances:Builder/openSUSE_Leap_15.2_ARM"/>
Expand All @@ -228,7 +243,12 @@ which includes aarch64 relevant content -->
</repository>
<repository type="rpm-md" alias="Leap_15_2" imageinclude="true"
profiles="Leap15.2.RaspberryPi4,Leap15.2.ARM64EFI">
<source path="http://download.opensuse.org/ports/aarch64/distribution/leap/15.2/repo/oss/"/>
<source path="https://download.opensuse.org/ports/aarch64/distribution/leap/15.2/repo/oss/"/>
</repository>
<!-- Leap 15.3 repo now multi architecture -->
<repository type="rpm-md" alias="Leap_15_3" imageinclude="true"
profiles="Leap15.3.x86_64,Leap15.3.RaspberryPi4,Leap15.3.ARM64EFI">
<source path="obs://openSUSE:Leap:15.3/standard"/>
</repository>
<repository type="rpm-md" alias="Tumbleweed" imageinclude="true"
profiles="Tumbleweed.x86_64">
Expand All @@ -237,15 +257,20 @@ which includes aarch64 relevant content -->
<!-- Alias repo-update Name="Main Update Repository" or "openSUSE-Tumbleweed-Update" in JeOS-->
<repository type="rpm-md" alias="Leap_15_2_Updates" imageinclude="true"
profiles="Leap15.2.x86_64">
<source path="http://download.opensuse.org/update/leap/15.2/oss/"/>
<source path="https://download.opensuse.org/update/leap/15.2/oss/"/>
</repository>
<repository type="rpm-md" alias="Leap_15_2_Updates" imageinclude="true"
profiles="Leap15.2.RaspberryPi4,Leap15.2.ARM64EFI">
<source path="http://download.opensuse.org/ports/update/leap/15.2/oss/"/>
<source path="https://download.opensuse.org/ports/update/leap/15.2/oss/"/>
</repository>
<!-- Leap 15.3 repo now multi architecture -->
<repository type="rpm-md" alias="Leap_15_3_Updates" imageinclude="true"
profiles="Leap15.3.x86_64,Leap15.3.RaspberryPi4,Leap15.3.ARM64EFI">
<source path="https://download.opensuse.org/update/leap/15.3/oss/"/>
</repository>
<repository type="rpm-md" alias="Tumbleweed_Updates" imageinclude="true"
profiles="Tumbleweed.x86_64">
<source path="http://download.opensuse.org/update/tumbleweed/"/>
<source path="https://download.opensuse.org/update/tumbleweed/"/>
</repository>
<!-- https://osinside.github.io/kiwi/working_with_kiwi/xml_description.html#adding-repositories -->
<!-- Local-Repository on build host: for pre-installed rockstor package -->
Expand All @@ -261,6 +286,14 @@ which includes aarch64 relevant content -->
profiles="Leap15.2.RaspberryPi4,Leap15.2.ARM64EFI">
<source path="http://updates.rockstor.com:8999/rockstor-testing/leap/15.2_aarch64/"/>
</repository>
<repository type="rpm-md" alias="Rockstor-Testing"
profiles="Leap15.3.x86_64">
<source path="http://updates.rockstor.com:8999/rockstor-testing/leap/15.3/"/>
</repository>
<repository type="rpm-md" alias="Rockstor-Testing"
profiles="Leap15.3.RaspberryPi4,Leap15.3.ARM64EFI">
<source path="http://updates.rockstor.com:8999/rockstor-testing/leap/15.3_aarch64/"/>
</repository>
<repository type="rpm-md" alias="Rockstor-Testing"
profiles="Tumbleweed.x86_64">
<source path="http://updates.rockstor.com:8999/rockstor-testing/tumbleweed/"/>
Expand All @@ -271,42 +304,58 @@ which includes aarch64 relevant content -->
<!-- those in default repositories. Shellinabox is not currently offered as part of the base system -->
<repository type="rpm-md" alias="shells" priority="105" imageinclude="true"
profiles="Leap15.2.x86_64">
<source path="http://download.opensuse.org/repositories/shells/openSUSE_Leap_15.2/"/>
<source path="https://download.opensuse.org/repositories/shells/openSUSE_Leap_15.2/"/>
</repository>
<!-- TODO: NOT YET AVAILABLE FOR LEAP 15.2/15.3 ON aarch64 so using mcbridematt repo for now -->
<!-- TODO: NOT YET AVAILABLE FOR LEAP 15.2 ON aarch64 so using mcbridematt repo for now -->
<!-- Previously shells/openSUSE_Factory_ARM worked but glibc updates there now prevent this -->
<!-- <repository type="rpm-md" alias="shells" priority="105" imageinclude="true"-->
<!-- profiles="Leap15.2.RaspberryPi4,Leap15.2.ARM64EFI">-->
<!-- <source path="https://download.opensuse.org/repositories/shells/openSUSE_Factory_ARM/"/>-->
<!-- </repository>-->
<!-- Rockstor home repo on OBS for Leap 15.3 + now hosts dual arch shellinabox -->
<!-- Maintain lower priority to upstream in case shellinabox is added there -->
<!-- https://build.opensuse.org/project/show/home:rockstor -->
<repository type="rpm-md" alias="home_rockstor" priority="105" imageinclude="true"
profiles="Leap15.3.x86_64,Leap15.3.RaspberryPi4,Leap15.3.ARM64EFI">
<source path="https://download.opensuse.org/repositories/home:/rockstor/openSUSE_Leap_15.3/"/>
</repository>
<repository type="rpm-md" alias="shells" priority="105" imageinclude="true"
profiles="Tumbleweed.x86_64">
<source path="http://download.opensuse.org/repositories/shells/openSUSE_Tumbleweed/"/>
<source path="https://download.opensuse.org/repositories/shells/openSUSE_Tumbleweed/"/>
</repository>
<!-- As per https://en.opensuse.org/Archive:Making_an_openSUSE_based_distribution -->
<!-- We are required to de/re-brand packages that have no "...branding-upstream" equivalent-->
<!-- This repo currently provides: systemd-presets-branding-rockstor -->
<!-- https://build.opensuse.org/package/show/home:rockstor:branches:Base:System/systemd-presets-branding-rockstor -->
<repository type="rpm-md" alias="home_rockstor_branches_Base_System" priority="97" imageinclude="true"
profiles="Leap15.2.x86_64,Leap15.2.ARM64EFI">
<source path="http://download.opensuse.org/repositories/home:/rockstor:/branches:/Base:/System/openSUSE_Leap_15.2/"/>
profiles="Leap15.2.x86_64">
<source path="https://download.opensuse.org/repositories/home:/rockstor:/branches:/Base:/System/openSUSE_Leap_15.2/"/>
</repository>
<!-- TODO: NOT YET AVAILABLE FOR LEAP15.2 aarch64 so use Factory_ARM source for now -->
<repository type="rpm-md" alias="home_rockstor_branches_Base_System" priority="97" imageinclude="true"
profiles="Leap15.2.RaspberryPi4">
<source path="https://download.opensuse.org/repositories/home:/rockstor:/branches:/Base:/System/openSUSE_Factory_ARM/"/>
profiles="Leap15.2.RaspberryPi4,Leap15.2.ARM64EFI">
<source path="https://download.opensuse.org/repositories/home:/rockstor:/branches:/Base:/System/openSUSE_Leap_15.2_ARM/"/>
</repository>
<!-- Leap 15.3 repo now multi architecture -->
<repository type="rpm-md" alias="home_rockstor_branches_Base_System" priority="97" imageinclude="true"
profiles="Leap15.3.x86_64,Leap15.3.RaspberryPi4,Leap15.3.ARM64EFI">
<source path="https://download.opensuse.org/repositories/home:/rockstor:/branches:/Base:/System/openSUSE_Leap_15.3/"/>
</repository>
<!-- TODO: Only a factory option, no tumbleweed option so factory for now -->
<repository type="rpm-md" alias="home_rockstor_branches_Base_System" priority="97" imageinclude="true"
profiles="Tumbleweed.x86_64">
<source path="http://download.opensuse.org/repositories/home:/rockstor:/branches:/Base:/System/openSUSE_Factory/"/>
<source path="https://download.opensuse.org/repositories/home:/rockstor:/branches:/Base:/System/openSUSE_Factory/"/>
</repository>
<!-- For Traverse Ten64 drivers and aarch64 shellinabox (while no aarch64 shells repo exists) -->
<!-- https://build.opensuse.org/project/show/home:mcbridematt -->
<repository type="rpm-md" alias="mcbridematt" imageinclude="true"
profiles="Leap15.2.ARM64EFI,Leap15.2.RaspberryPi4,">
<source path="obs://home:mcbridematt/openSUSE_Leap_15.2/" />
</repository>
<!-- As of Leap 15.3 home_rockstor hosts multi-arch shellinabox -->
<repository type="rpm-md" alias="mcbridematt" imageinclude="true"
profiles="Leap15.3.ARM64EFI">
<source path="obs://home:mcbridematt/openSUSE_Leap_15.3/" />
</repository>
<packages type="image">
<package name="adaptec-firmware"/> <!--Razor AIC94xx Series SAS-->
<package name="bash-completion"/>
Expand Down Expand Up @@ -408,7 +457,7 @@ which includes aarch64 relevant content -->
<!--Change to reflect the version specified, i.e. 4.0.4-0 -->
<package name="rockstor-4.0.4-0"/>
</packages>
<packages type="image" profiles="Leap15.2.RaspberryPi4">
<packages type="image" profiles="Leap15.2.RaspberryPi4,Leap15.3.RaspberryPi4">
<package name="raspberrypi-firmware" arch="aarch64"/>
<package name="raspberrypi-firmware-config" arch="aarch64"/>
<package name="raspberrypi-firmware-dt" arch="aarch64"/>
Expand Down