live: fix_bootconfig.s390x: use initrd.ofs for the initrd offset filename#1969
Merged
imobachgs merged 2 commits intoagama-project:masterfrom Feb 4, 2025
Merged
Conversation
Ensure we know if the arch-specific bootconfig scripts fail. Signed-off-by: Eugenio Paolantonio <eugenio.paolantonio@suse.com>
…name mksusecd expects the offset to be written in initrd.ofs. Change the filename to match it. This fixes building of "combined" Full offline images on s390x. Signed-off-by: Eugenio Paolantonio <eugenio.paolantonio@suse.com>
g7
force-pushed
the
epaolantonio/live-s390x-fixes
branch
from
afc0a4c to
eab53bc
Compare
imobachgs
approved these changes
Feb 4, 2025
Contributor
|
Why do you rename that file? It has been |
Contributor
|
Also, the problem is not
but mksusecd expects all files referenced in suse.ins to exist. |
Contributor
Author
|
oh! Misunderstood the error message (since it is coming from suse.ins, now it makes sense to me). I will prepare a follow up PR that reverts this change |
Contributor
|
Thanks! |
g7
added a commit
to g7/agama
that referenced
this pull request
Feb 4, 2025
…offset See discussion in bsc#1236781, and gh#agama-project#1969. This essentially reverts c3c8fc4. Signed-off-by: Eugenio Paolantonio <eugenio.paolantonio@suse.com>
g7
added a commit
to g7/agama
that referenced
this pull request
Feb 4, 2025
…offset See discussion in bsc#1236781, and gh#agama-project#1969. This essentially reverts c3c8fc4. Signed-off-by: Eugenio Paolantonio <eugenio.paolantonio@suse.com>
g7
added a commit
to g7/agama
that referenced
this pull request
Feb 5, 2025
…offset See discussion in bsc#1236781, and gh#agama-project#1969. This essentially reverts c3c8fc4. Signed-off-by: Eugenio Paolantonio <eugenio.paolantonio@suse.com>
imobachgs
added a commit
that referenced
this pull request
Feb 7, 2025
…offset (#1974) See discussion in bsc#1236781, and #1969. This essentially reverts c3c8fc4. ## Problem `initrd.ofs` was a red herring, and I'm not sure how we got to that, most likely it might have slipped in while manually debugging the media. So the actual bug was the offset file not being created at all, and now it's sorted out too by adding the `xxd` requirement (and thanks to snwint, latest `mksusecd` can re-generate it as well). ## Solution Restore the previous `initrd.off` naming which is widely used. The other commit from #1969 is not reverted (that introduces `set -e` in the fix_bootconfig scripts) so builds will still fail if xxd is not present in the build environment. ## Testing - *Tested manually* Apologies for the noise.
Merged
imobachgs
added a commit
that referenced
this pull request
Feb 26, 2025
Prepare for releasing Agama 12: * #1858 * #1887 * #1890 * #1892 * #1893 * #1894 * #1896 * #1898 * #1899 * #1900 * #1901 * #1906 * #1908 * #1909 * #1910 * #1911 * #1912 * #1914 * #1915 * #1917 * #1919 * #1920 * #1921 * #1922 * #1923 * #1924 * #1926 * #1927 * #1928 * #1929 * #1930 * #1931 * #1932 * #1933 * #1934 * #1935 * #1936 * #1937 * #1938 * #1939 * #1942 * #1943 * #1945 * #1948 * #1949 * #1952 * #1953 * #1954 * #1955 * #1957 * #1958 * #1959 * #1961 * #1963 * #1964 * #1967 * #1969 * #1970 * #1971 * #1972 * #1973 * #1974 * #1975 * #1976 * #1977 * #1979 * #1980 * #1981 * #1982 * #1984 * #1986 * #1987 * #1988 * #1990 * #1991 * #1992 * #1993 * #1995 * #1996 * #1997 * #1999 * #2000 * #2001 * #2002 * #2003 * #2004 * #2005 * #2006 * #2007 * #2008 * #2009 * #2010 * #2011 * #2012 * #2013 * #2014 * #2015 * #2016 * #2017 * #2019 * #2021 * #2022 * #2025 * #2027 * #2029 * #2030 * #2031 * #2033 * #2034 * #2035 * #2036 * #2037 * #2038 * #2039 * #2040 * #2045 * #2046 * #2050 * #2053 * #2054 * #2055 * #2056 * #2058 * #2060 * #2061 * #2062 * #2063 * #2064 * #2066 * #2067 * #2068 * #2069 * #2070 * #2071 * #2072 * #2073 * #2075 * #2076 * #2080 * #2082 * #2083
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
mksusecd expects the offset to be written in initrd.ofs.
Solution
Change the filename from
initrd.offtoinitrd.ofsto match what mksuse expects.This fixes building of "combined" Full offline images on s390x.
This pull request also adds a commit that ensures that the arch-specific
fix_bootconfigscripts exit at the first failure.xxdis not available in the build environment (in SLFO:Main at least), soinitrd.off(now.ofs) andinitrd.sizwere never being created in the first place. Exiting as soon as the first failure will hopefully help us catch this kind of bugs earlier 😄NOTE: due to this, s390x builds might fail if xxd is not present. This OBS prjconf snippet should ensure that it is getting installed on image builds:
Testing