This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, seventeen has been updated via fc1e20890b10ff14d3ccea21ed07307e37638422 (commit) via c3efda65dfc545cc56fce039ff80ea3125a48298 (commit) via d70f58f60c3f195e5804f87fd5037eedefad6a3f (commit) from b3f5e2b2a9153bf4a55c79f44d8a983487f7b55c (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit fc1e20890b10ff14d3ccea21ed07307e37638422 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Nov 30 11:59:29 2014 +0100
kernel: rootfile updates.
commit c3efda65dfc545cc56fce039ff80ea3125a48298 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Nov 30 09:30:58 2014 +0100
linux-initrd: skip initrd build of pae and rpi kernel.
commit d70f58f60c3f195e5804f87fd5037eedefad6a3f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Nov 30 09:25:56 2014 +0100
samba: fix mode of winbindd_privileged folder.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/i586/linux | 3 ++- config/rootfiles/packages/linux-pae | 2 +- lfs/linux-initrd | 7 +++++++ lfs/samba | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index aec5857..ff17a62 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -1,6 +1,5 @@ boot/System.map-KVER-ipfire boot/config-KVER-ipfire -boot/initramfs-KVER-ipfire.img boot/vmlinuz-KVER-ipfire etc/modprobe.d/framebuffer.conf etc/modprobe.d/ipv6.conf @@ -19,6 +18,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/cpu #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/cpu/microcode #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/cpu/microcode/microcode.ko +#lib/modules/KVER-ipfire/kernel/arch/x86/kernel/iosf_mbi.ko #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/test_nx.ko #lib/modules/KVER-ipfire/kernel/arch/x86/kvm #lib/modules/KVER-ipfire/kernel/arch/x86/kvm/kvm-amd.ko @@ -3076,3 +3076,4 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/modules.symbols.bin #lib/modules/KVER-ipfire/source sbin/gen_init_cpio +boot/initramfs-KVER-ipfire.img diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index 19f458c..511b0f3 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -1,6 +1,5 @@ boot/System.map-KVER-ipfire-pae boot/config-KVER-ipfire-pae -#boot/initramfs-KVER-ipfire-pae.img boot/vmlinuz-KVER-ipfire-pae #lib/modules lib/modules/KVER-ipfire-pae @@ -17,6 +16,7 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu #lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/microcode #lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/microcode/microcode.ko +#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/iosf_mbi.ko #lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/test_nx.ko #lib/modules/KVER-ipfire-pae/kernel/arch/x86/kvm #lib/modules/KVER-ipfire-pae/kernel/arch/x86/kvm/kvm-amd.ko diff --git a/lfs/linux-initrd b/lfs/linux-initrd index 1b048b5..b5cc422 100644 --- a/lfs/linux-initrd +++ b/lfs/linux-initrd @@ -57,6 +57,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # rebuild module deps depmod -a $(KVER)-$(VERSUFIX)
+ #skip initrd build on pae and rpi kernel. +ifneq "$(KCFG)" "-rpi" +ifneq "$(KCFG)" "-pae" + # Create initramfs images dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
@@ -67,4 +71,7 @@ endif ifeq "$(KCFG)" "-multi" cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX) endif + +endif +endif @$(POSTBUILD) diff --git a/lfs/samba b/lfs/samba index 3772ad3..213f8eb 100644 --- a/lfs/samba +++ b/lfs/samba @@ -119,7 +119,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -p /var/log/samba install -v -m 644 $(DIR_SRC)/config/backup/includes/samba /var/ipfire/backup/addons/includes/samba
- -mkdir -p 750 /var/lib/samba/winbindd_privileged + -mkdir -p /var/lib/samba/winbindd_privileged + chmod 750 /var/lib/samba/winbindd_privileged chgrp wbpriv /var/lib/samba/winbindd_privileged
@rm -rf $(DIR_APP)
hooks/post-receive -- IPFire 2.x development tree