Skip to content

Commit

Permalink
release 4.1-12
Browse files Browse the repository at this point in the history
  • Loading branch information
raphael committed Aug 12, 2015
1 parent 713be4b commit 3fcf7f4
Show file tree
Hide file tree
Showing 151 changed files with 1,468 additions and 974 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v4.1-12 / 2015-08-11
--------------------
Upgrade to Linux v4.1.5

v4.1-11 / 2015-08-03
--------------------
Make AppArmor default security module
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ To build a new release:
1. Update CHANGELOG
2. Bump versions in scripts/archlinux/PKGBUILD and aur/PKGBUILD
3. Clean up: cd build/archlinux ; rm -rf * ; cd ../debian ; rm -rf * ; cd ../..
4. Build packages: cd scripts; ./build.sh linux-stable v4.1 v4.1.4
4. Build packages: cd scripts; ./build.sh linux-stable v4.1 v4.1.5
5. Install new package, reboot and test
6. Build source: rm -rf build/linux;cp -r build/linux-patched build/linux; cd build/linux; rm -rf .git; make clean ; rm .config ; ln -s ../../scripts/config .config
7. Commit / push all packages using "release 4.1-x" message
Expand Down
6 changes: 3 additions & 3 deletions aur/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

pkgbase=linux-samus4
pkgver=4.1
pkgrel=11
pkgrel=12
arch=('x86_64')
url="http://www.kernel.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
options=('!strip')
source=("https://github.com/raphael/linux-4.1-samus/archive/v4.1-11.tar.gz"
source=("https://github.com/raphael/linux-4.1-samus/archive/v4.1-12.tar.gz"
"config"
"linux.preset"
)
_kernelname=${pkgbase#linux}
_linuxsrc=linux-4.1-samus-4.1-11/build/linux/
_linuxsrc=linux-4.1-samus-4.1-12/build/linux/

# $srcdir is: /home/raphael/src/kernel-pkg/src
prepare() {
Expand Down
4 changes: 2 additions & 2 deletions build/linux/Documentation/hwmon/nct7904
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ temp1_input Local temperature (1/1000 degree,
temp[2-9]_input CPU temperatures (1/1000 degree,
0.125 degree resolution)

fan[1-4]_mode R/W, 0/1 for manual or SmartFan mode
pwm[1-4]_enable R/W, 1/2 for manual or SmartFan mode
Setting SmartFan mode is supported only if it has been
previously configured by BIOS (or configuration EEPROM)

fan[1-4]_pwm R/O in SmartFan mode, R/W in manual control mode
pwm[1-4] R/O in SmartFan mode, R/W in manual control mode

The driver checks sensor control registers and does not export the sensors
that are not enabled. Anyway, a sensor that is enabled may actually be not
Expand Down
8 changes: 8 additions & 0 deletions build/linux/Documentation/kbuild/makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -952,6 +952,14 @@ When kbuild executes, the following steps are followed (roughly):
$(KBUILD_ARFLAGS) set by the top level Makefile to "D" (deterministic
mode) if this option is supported by $(AR).

ARCH_CPPFLAGS, ARCH_AFLAGS, ARCH_CFLAGS Overrides the kbuild defaults

These variables are appended to the KBUILD_CPPFLAGS,
KBUILD_AFLAGS, and KBUILD_CFLAGS, respectively, after the
top-level Makefile has set any other flags. This provides a
means for an architecture to override the defaults.


--- 6.2 Add prerequisites to archheaders:

The archheaders: rule is used to generate header files that
Expand Down
11 changes: 6 additions & 5 deletions build/linux/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 1
SUBLEVEL = 4
SUBLEVEL = 5
EXTRAVERSION =
NAME = Series 4800

Expand Down Expand Up @@ -783,10 +783,11 @@ endif
include scripts/Makefile.kasan
include scripts/Makefile.extrawarn

# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
KBUILD_CPPFLAGS += $(KCPPFLAGS)
KBUILD_AFLAGS += $(KAFLAGS)
KBUILD_CFLAGS += $(KCFLAGS)
# Add any arch overrides and user supplied CPPFLAGS, AFLAGS and CFLAGS as the
# last assignments
KBUILD_CPPFLAGS += $(ARCH_CPPFLAGS) $(KCPPFLAGS)
KBUILD_AFLAGS += $(ARCH_AFLAGS) $(KAFLAGS)
KBUILD_CFLAGS += $(ARCH_CFLAGS) $(KCFLAGS)

# Use --build-id when available.
LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\
Expand Down
3 changes: 2 additions & 1 deletion build/linux/arch/arc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ endif

ifndef CONFIG_CC_OPTIMIZE_FOR_SIZE
# Generic build system uses -O2, we want -O3
cflags-y += -O3
# Note: No need to add to cflags-y as that happens anyways
ARCH_CFLAGS += -O3
endif

# small data is default for elf32 tool-chain. If not usable, disable it
Expand Down
Loading

0 comments on commit 3fcf7f4

Please sign in to comment.