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

Jump to bottom

[linux-glibc-devel] Update to 4.4 and convert to submodule. JB#58868 #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[linux-glibc-devel] Update to 4.4 and convert to submodule. JB#58868 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "upstream"]
path = upstream
url = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
153 changes: 0 additions & 153 deletions api-fix-compatibility-of-linux-in.h-with-netinet-in.patch
View file
Open in desktop

This file was deleted.

Binary file removed linux-3.18.136.tar.xz
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions linux-glibc-devel.changes → rpm/linux-glibc-devel.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Wed Nov 06 2024 Matti Viljanen <[email protected]> - 4.4.302
- Update to 4.4 and convert to submodule. JB#58868

* Mon Jan 22 2024 Matti Lehtimäki <[email protected]> - 3.18.136-2
- Rename kernel-headers to linux-glibc-devel. JB#59595

Expand Down
14 changes: 5 additions & 9 deletions linux-glibc-devel.spec → rpm/linux-glibc-devel.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Name: linux-glibc-devel
License: GPLv2
URL: http://www.kernel.org/

%define kversion 3.18.136
%define kversion 4.4.302
Version: %{kversion}
Release: 2
Release: 1
Provides: kernel-headers = %{kversion}
Obsoletes: kernel-headers <= %{kversion}

Expand All @@ -26,8 +26,7 @@ Obsoletes: kernel-headers <= %{kversion}
# code.
#

Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-%{kversion}.tar.xz
Patch0: api-fix-compatibility-of-linux-in.h-with-netinet-in.patch
Source0: %{name}-%{version}.tar.xz

BuildRequires: findutils, make >= 3.78, diffutils, gawk

Expand All @@ -38,12 +37,10 @@ low level system software, and is only used indirectly by regular
applications.

%prep
%setup -q -n linux-%{kversion}
# api-fix-compatibility-of-linux-in.h-with-netinet-in.patch
%patch0 -p1
%autosetup -p1 -n %{name}-%{version}/upstream

%build
make allyesconfig
make mrproper
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This I'm not following. Why change? Make mrproper should be doing some cleaning, but there isn't anything really build? Older version actually did some config stuff.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made a test build with make allyesconfig for i486 -- the RPM packages are file-by-file identical (save the timestamped and commit-ref'd path for COPYING). I also checked OpenSUSE's .spec file, and it doesn't contain any make commands. I suspect that change is just a development leftover.

I'd say it can be left as-is (and that way we don't have to make yet another build round).


%install

Expand All @@ -58,6 +55,5 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/io.h
rm -f $RPM_BUILD_ROOT/usr/include/asm*/irq.h

%files
%defattr(-,root,root)
%license COPYING
/usr/include/*
1 change: 1 addition & 0 deletions upstream
Open in desktop
Submodule upstream added at a09b2d