1 Index: toolchain/kernel-headers/Makefile
2 ===================================================================
3 --- toolchain/kernel-headers/Makefile (revisión: 22294)
4 +++ toolchain/kernel-headers/Makefile (copia de trabajo)
6 PKG_VERSION:=$(LINUX_VERSION)
7 PKG_SOURCE:=$(LINUX_SOURCE)
8 PKG_SOURCE_URL:=$(LINUX_SITE)
9 -HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
11 +ifneq ($(CONFIG_USE_LIBRE_KERNEL),)
12 + HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(shell echo $(LINUX_VERSION) | cut -d"-" -f1 -)
14 + HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
17 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
18 LINUX_DIR := $(HOST_BUILD_DIR)
20 Index: include/kernel.mk
21 ===================================================================
22 --- include/kernel.mk (revisión: 22294)
23 +++ include/kernel.mk (copia de trabajo)
25 FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)")
27 KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
28 - LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
29 + ifneq ($(CONFIG_USE_LIBRE_KERNEL),)
30 + LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(shell echo $(LINUX_VERSION) | cut -d"-" -f1 -)
32 + LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
36 MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
37 TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
40 LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
41 TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,)
42 ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE)),)
43 - LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING)
44 + ifneq ($(CONFIG_USE_LIBRE_KERNEL),)
45 + LINUX_SITE:=@KERNEL_LIBRE/download/releases/$(LINUX_VERSION)
47 + LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING)
51 ifneq ($(TARGET_BUILD),1)
52 - PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
53 + ifneq ($(CONFIG_USE_LIBRE_KERNEL),)
54 + PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(shell echo $(PKG_VERSION) | cut -d"-" -f1 -))
56 + PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
61 Index: include/kernel-defaults.mk
62 ===================================================================
63 --- include/kernel-defaults.mk (revisión: 22294)
64 +++ include/kernel-defaults.mk (copia de trabajo)
66 KERNEL_MAKEOPTS += CC="$(KERNEL_CC)"
69 +ifneq ($(CONFIG_ON_SITE_DEBLOB),)
70 + CURRENT_DIR:=$(shell pwd)
72 + @echo "Deblobing kernel sources at $(LINUX_DIR)"
73 + cd $(LINUX_DIR) && $(SCRIPT_DIR)/deblob/deblob-$(shell echo $(LINUX_VERSION) | cut -d"." -f1,2,3 -) && cd $(CURRENT_DIR)
79 Kernel/Patch:=$(Kernel/Patch/Default)
80 ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"")
81 ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"")
82 define Kernel/Prepare/Default
83 bzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
86 touch $(LINUX_DIR)/.quilt_used
88 Index: include/download.mk
89 ===================================================================
90 --- include/download.mk (revisión: 22294)
91 +++ include/download.mk (copia de trabajo)
96 - $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% file://%,$(1)),default, \
97 + $(if $(filter @GNOME/% @GNU/% @KERNEL/% @KERNEL_LIBRE/% @SF/% ftp://% http://% file://%,$(1)),default, \
98 $(if $(filter git://%,$(1)),git, \
99 $(if $(filter svn://%,$(1)),svn, \
100 $(if $(filter cvs://%,$(1)),cvs, \
101 Index: target/linux/x86/Makefile
102 ===================================================================
103 --- target/linux/x86/Makefile (revisión: 22294)
104 +++ target/linux/x86/Makefile (copia de trabajo)
106 FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia targz
107 SUBTARGETS=generic olpc xen_domu ep80579 net5501
109 -LINUX_VERSION:=2.6.32.16
110 +ifneq ($(CONFIG_USE_LIBRE_KERNEL),)
111 + LINUX_VERSION:=2.6.32.16-libre1
113 + LINUX_VERSION:=2.6.32.16
116 include $(INCLUDE_DIR)/target.mk
118 Index: target/linux/xburst/Makefile
119 ===================================================================
120 --- target/linux/xburst/Makefile (revisión: 22294)
121 +++ target/linux/xburst/Makefile (copia de trabajo)
123 FEATURES:=jffs2 targz ubifs audio
124 SUBTARGETS:=qi_lb60 n516 n526
126 -LINUX_VERSION:=2.6.34.1
127 +ifneq ($(CONFIG_USE_LIBRE_KERNEL),)
128 + LINUX_VERSION:=2.6.34.1-libre
130 + LINUX_VERSION:=2.6.34.1
135 Index: scripts/download.pl
136 ===================================================================
137 --- scripts/download.pl (revisión: 22294)
138 +++ scripts/download.pl (copia de trabajo)
140 push @mirrors, "http://ftp.de.kernel.org/pub/$1";
141 push @mirrors, "ftp://ftp.fr.kernel.org/pub/$1";
142 push @mirrors, "http://ftp.fr.kernel.org/pub/$1";
143 + } elsif ($mirror =~ /^\@KERNEL_LIBRE\/(.+)$/) {
144 + push @mirrors, "http://www.fsfla.org/svnwiki/selibre/linux-libre/$1";
145 } elsif ($mirror =~ /^\@GNOME\/(.+)$/) {
146 push @mirrors, "http://ftp.gnome.org/pub/GNOME/sources/$1";
147 push @mirrors, "http://ftp.unina.it/pub/linux/GNOME/sources/$1";
149 ===================================================================
150 --- Config.in (revisión: 22294)
151 +++ Config.in (copia de trabajo)
157 +config USE_LIBRE_KERNEL
158 + bool "Use only 100% free software"
159 + depends TARGET_x86 || TARGET_xburst
162 menu "Global build settings"
167 Compiler cache; see http://ccache.samba.org/
169 + config ON_SITE_DEBLOB
170 + bool "Deblob Linux kernel on site" if DEVEL
171 + depends TARGET_x86 || TARGET_xburst
174 config EXTERNAL_KERNEL_TREE
175 string "Use external kernel tree" if DEVEL