Skip to content

Commit 7f8de2b

Browse files
committed
Merge tag 'linux-cpupower-6.12-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux
Pull cpupower updates from Shuah Khan "The 'raw_pylibcpupower.i' file was being removed by "make mrproper". That was because '*.i', '.s' and '*.o' files are generated during kernel compile and removed when the repo is cleaned by mrproper. Rename it to use .swg extension instead to avoid the problem. A second patch removes references to it from .gitignore" * tag 'linux-cpupower-6.12-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux: pm: cpupower: Clean up bindings gitignore pm: cpupower: rename raw_pylibcpupower.i
2 parents cd3d647 + 6c56fb4 commit 7f8de2b

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
__pycache__/
23
raw_pylibcpupower_wrap.c
34
*.o
45
*.so
56
*.py
67
!test_raw_pylibcpupower.py
7-
# git keeps ignoring this file, use git add -f raw_libcpupower.i
8-
!raw_pylibcpupower.i

tools/power/cpupower/bindings/python/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ _raw_pylibcpupower.so: raw_pylibcpupower_wrap.o
2020
raw_pylibcpupower_wrap.o: raw_pylibcpupower_wrap.c
2121
$(CC) -fPIC -c raw_pylibcpupower_wrap.c $(PY_INCLUDE)
2222

23-
raw_pylibcpupower_wrap.c: raw_pylibcpupower.i
23+
raw_pylibcpupower_wrap.c: raw_pylibcpupower.swg
2424
ifeq ($(HAVE_SWIG),0)
2525
$(error "swig was not found. Make sure you have it installed and in the PATH to generate the bindings.")
2626
else ifeq ($(HAVE_PYCONFIG),0)
2727
$(error "python-config was not found. Make sure you have it installed and in the PATH to generate the bindings.")
2828
endif
29-
swig -python raw_pylibcpupower.i
29+
swig -python raw_pylibcpupower.swg
3030

3131
# Will only clean the bindings folder; will not clean the actual cpupower folder
3232
clean:

0 commit comments

Comments
 (0)