implement quilt handling for the kernel tree ... and there was much rejoicing!

SVN-Revision: 7474
master
Felix Fietkau 18 years ago
parent 5e406f0a28
commit 3b6b7a2d1b
  1. 7
      include/kernel-build.mk
  2. 7
      include/kernel-defaults.mk
  3. 70
      include/quilt.mk
  4. 2
      target/Makefile
  5. 3
      target/linux/Makefile

@ -53,6 +53,9 @@ else
) )
endif endif
STAMP_PREPARED:=$(LINUX_DIR)/.prepared
STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
include $(INCLUDE_DIR)/quilt.mk
include $(INCLUDE_DIR)/kernel-defaults.mk include $(INCLUDE_DIR)/kernel-defaults.mk
define Kernel/Prepare define Kernel/Prepare
@ -82,13 +85,13 @@ define BuildKernel
$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE) $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
endif endif
$(LINUX_DIR)/.prepared: $(DL_DIR)/$(LINUX_SOURCE) $(STAMP_PREPARED): $(DL_DIR)/$(LINUX_SOURCE)
-rm -rf $(KERNEL_BUILD_DIR) -rm -rf $(KERNEL_BUILD_DIR)
-mkdir -p $(KERNEL_BUILD_DIR) -mkdir -p $(KERNEL_BUILD_DIR)
$(call Kernel/Prepare) $(call Kernel/Prepare)
touch $$@ touch $$@
$(LINUX_DIR)/.configured: $(LINUX_DIR)/.prepared $(LINUX_CONFIG) $(STAMP_CONFIGURED): $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
$(call Kernel/Configure) $(call Kernel/Configure)
touch $$@ touch $$@

@ -27,12 +27,11 @@ KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
CONFIG_SHELL="$(BASH)" CONFIG_SHELL="$(BASH)"
# defined in quilt.mk
Kernel/Patch:=$(Kernel/Patch/Default)
define Kernel/Prepare/Default define Kernel/Prepare/Default
bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
if [ -d $(GENERIC_PLATFORM_DIR)/files ]; then $(CP) $(GENERIC_PLATFORM_DIR)/files/* $(LINUX_DIR)/; fi $(Kernel/Patch)
if [ -d $(GENERIC_PLATFORM_DIR)/patches ]; then $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches; fi
if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi
if [ -d ./patches ]; then $(PATCH) $(LINUX_DIR) ./patches; fi
endef endef
define Kernel/Configure/2.4 define Kernel/Configure/2.4

@ -5,22 +5,30 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
ifeq ($(KERNEL_BUILD),1)
PKG_BUILD_DIR:=$(LINUX_DIR)
endif
define Quilt/Patch
@for patch in $$$$( (cd $(1) && ls) 2>/dev/null ); do ( \
cp "$(1)/$$$$patch" $(PKG_BUILD_DIR); \
cd $(PKG_BUILD_DIR); \
quilt import -P$(2)$$$$patch -p 1 "$$$$patch"; \
quilt push -f >/dev/null 2>/dev/null; \
rm -f "$$$$patch"; \
); done
endef
QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y)) QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y))
ifneq ($(QUILT),) ifneq ($(QUILT),)
STAMP_PREPARED:=$(strip $(STAMP_PREPARED))_q STAMP_PREPARED:=$(strip $(STAMP_PREPARED))_q
STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
CONFIG_AUTOREBUILD= CONFIG_AUTOREBUILD=
PATCHES:=$(shell (cd ./patches && ls) 2>/dev/null) PATCHES:=$(shell )
define Build/Patch/Default define Build/Patch/Default
rm -rf $(PKG_BUILD_DIR)/patches rm -rf $(PKG_BUILD_DIR)/patches
mkdir -p $(PKG_BUILD_DIR)/patches mkdir -p $(PKG_BUILD_DIR)/patches
@for patch in $(PATCHES); do ( \ $(call Quilt/Patch,./patches,)
cp "./patches/$$$$patch" $(PKG_BUILD_DIR); \
cd $(PKG_BUILD_DIR); \
quilt import -p 1 "$$$$patch"; \
quilt push -f >/dev/null 2>/dev/null; \
rm -f "$$$$patch"; \
); done
@echo @echo
touch $(PKG_BUILD_DIR)/.quilt_used touch $(PKG_BUILD_DIR)/.quilt_used
endef endef
@ -34,11 +42,46 @@ else
endef endef
endif endif
define Kernel/Patch/Default
if [ -d $(GENERIC_PLATFORM_DIR)/files ]; then $(CP) $(GENERIC_PLATFORM_DIR)/files/* $(LINUX_DIR)/; fi
if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi
$(if $(strip $(QUILT)),$(call Quilt/Patch,$(GENERIC_PLATFORM_DIR)/patches,generic/), \
if [ -d $(GENERIC_PLATFORM_DIR)/patches ]; then $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches; fi \
)
$(if $(strip $(QUILT)),$(call Quilt/Patch,./patches,platform/), \
if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi \
)
touch $(PKG_BUILD_DIR)/.quilt_used
endef
$(STAMP_PATCHED): $(STAMP_PREPARED) $(STAMP_PATCHED): $(STAMP_PREPARED)
@cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true @cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true
$(if $(strip $(PATCHES)),cd $(PKG_BUILD_DIR); quilt push -a) [ -f "$(PKG_BUILD_DIR)/patches/series" ] && cd $(PKG_BUILD_DIR); quilt push -a
touch $@ touch $@
define Quilt/RefreshDir
mkdir -p $(1)
-rm -f $(1)/* 2>/dev/null >/dev/null
@( \
for patch in $$($(if $(2),grep "^$(2)",cat) $(PKG_BUILD_DIR)/patches/series | awk '{print $$1}'); do \
$(CP) -v "$(PKG_BUILD_DIR)/patches/$$patch" $(1); \
done; \
)
endef
define Quilt/Refresh/Package
$(call Quilt/RefreshDir,./patches)
endef
define Quilt/Refresh/Kernel
@[ -z "$$(grep -v '^generic/' $(PKG_BUILD_DIR)/patches/series | grep -v '^platform/')" ] || { \
echo "All kernel patches must start with either generic/ or platform/"; \
false; \
}
$(call Quilt/RefreshDir,$(GENERIC_PLATFORM_DIR)/patches,generic/)
$(call Quilt/RefreshDir,./patches,platform/)
endef
refresh: $(STAMP_PREPARED) refresh: $(STAMP_PREPARED)
@[ -f "$(PKG_BUILD_DIR)/.quilt_used" ] || { \ @[ -f "$(PKG_BUILD_DIR)/.quilt_used" ] || { \
echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \ echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \
@ -52,10 +95,5 @@ refresh: $(STAMP_PREPARED)
echo "The patches are not sorted in the right order. Please fix."; \ echo "The patches are not sorted in the right order. Please fix."; \
false; \ false; \
} }
mkdir -p ./patches $(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
rm -f ./patches/* 2>/dev/null >/dev/null
@( \
for patch in $$(cat $(PKG_BUILD_DIR)/patches/series); do \
$(CP) -v "$(PKG_BUILD_DIR)/patches/$$patch" ./patches; \
done; \
)

@ -51,5 +51,5 @@ image_install: image_compile
imagebuilder_install: image_install imagebuilder_install: image_install
$(MAKE) -C imagebuilder install $(MAKE) -C imagebuilder install
%-prereq %-prepare %-download %-clean %-compile %-install: FORCE %-prereq %-prepare %-download %-clean %-compile %-install %-refresh: FORCE
$(MAKE) -C $* $(patsubst $*-%,%,$@) $(MAKE) -C $* $(patsubst $*-%,%,$@)

@ -19,6 +19,9 @@ compile:
install: install:
$(MAKE) -C $(BOARD)-$(KERNEL) install $(MAKE) -C $(BOARD)-$(KERNEL) install
refresh:
$(MAKE) -C $(BOARD)-$(KERNEL) refresh
menuconfig: menuconfig:
$(MAKE) -C $(BOARD)-$(KERNEL) menuconfig $(MAKE) -C $(BOARD)-$(KERNEL) menuconfig

Loading…
Cancel
Save