mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2026-02-04 14:37:45 +01:00
a4e92f0484
Removing tmp/ after having built base-files or toolchain currently
breaks rootfs generation:
$ rm -rf tmp
$ make V=w
...
make[2] package/install
cat: .../openwrt/tmp/base-files.version: No such file or directory
cat: .../openwrt/openwrt/tmp/libc.version: No such file or directory
ERROR: 'base-files=' is not a valid world dependency, format is name(@tag)([<>~=]version)
make[2]: *** [package/Makefile💯 package/install] Error 99
The only way to recover from here is to clean toolchain and base-files via
$ make package/{base-files,toolchain}/clean
tmp is supposed to be ephemeral, so clearing it is an expected action,
which normally just triggers a regeneration of all files there.
Fix this by moving the version files to $(STAGING_DIR).
Fixes: 63e178f067 ("build: lock versions for special APK packages")
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21803
Signed-off-by: Robert Marko <robimarko@gmail.com>
78 lines
2.1 KiB
Makefile
78 lines
2.1 KiB
Makefile
#
|
|
# Copyright (C) 2006-2010 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
include $(INCLUDE_DIR)/kernel.mk
|
|
|
|
PKG_NAME:=kernel
|
|
PKG_FLAGS:=hold
|
|
|
|
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
|
|
SUBTARGETS = $(sort $(filter-out feeds,$(notdir $(wildcard $(TOPDIR)/target/linux/* $(TOPDIR)/target/linux/feeds/*))))
|
|
SUBTARGET_MODULES = $(foreach t,$(SUBTARGETS),$(firstword $(wildcard $(TOPDIR)/target/linux/feeds/$(t)/modules.mk $(TOPDIR)/target/linux/$(t)/modules.mk)))
|
|
SCAN_DEPS=modules/*.mk $(SUBTARGET_MODULES) $(TOPDIR)/include/netfilter.mk
|
|
|
|
PKG_LICENSE:=GPL-2.0-only
|
|
PKG_LICENSE_FILES:=COPYING
|
|
PKG_CPE_ID:=cpe:/o:linux:linux_kernel
|
|
|
|
export SHELL:=/bin/sh
|
|
.ONESHELL:
|
|
.SHELLFLAGS = -ec
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
|
|
ifeq ($(DUMP),)
|
|
STAMP_BUILT:=$(STAMP_BUILT)_$(shell $(SCRIPT_DIR)/kconfig.pl $(LINUX_DIR)/.config | $(MKHASH) md5)
|
|
-include $(LINUX_DIR)/.config
|
|
endif
|
|
|
|
define Build/Prepare
|
|
mkdir -p $(PKG_BUILD_DIR)
|
|
endef
|
|
|
|
define Build/Configure
|
|
endef
|
|
|
|
define Build/Quilt
|
|
endef
|
|
|
|
define Build/Compile
|
|
endef
|
|
|
|
define KernelPackage/depends
|
|
endef
|
|
|
|
CONFIG_PACKAGE_kernel=y
|
|
define Package/kernel
|
|
SECTION:=sys
|
|
CATEGORY:=Kernel
|
|
DEFAULT:=y
|
|
TITLE:=Virtual kernel package
|
|
VERSION:=$(subst -rc,_rc,$(LINUX_VERSION))~$(LINUX_VERMAGIC)-r$(LINUX_RELEASE)
|
|
URL:=https://www.kernel.org/
|
|
PKG_FLAGS:=nonshared
|
|
endef
|
|
|
|
define Package/kernel/install
|
|
$(INSTALL_DIR) $(1)/$(MODULES_SUBDIR)
|
|
$(INSTALL_DATA) $(LINUX_DIR)/modules.builtin $(1)/$(MODULES_SUBDIR)
|
|
$(SED) 's,.*/,,' $(1)/$(MODULES_SUBDIR)/modules.builtin
|
|
strings $(LINUX_DIR)/modules.builtin.modinfo | \
|
|
grep -E -v "\.(file$(if CONFIG_MODULE_STRIPPED,|parmtype))=" | \
|
|
tr '\n' '\0' > $(1)/$(MODULES_SUBDIR)/modules.builtin.modinfo
|
|
echo $(LINUX_VERSION)~$(LINUX_VERMAGIC)-r$(LINUX_RELEASE) > $(STAGING_DIR)/kernel.version
|
|
endef
|
|
|
|
define Package/kernel/extra_provides
|
|
sed -e 's,.*/,,' $(LINUX_DIR)/modules.builtin;
|
|
endef
|
|
|
|
$(eval $(if $(DUMP),,$(call BuildPackage,kernel)))
|
|
|
|
include $(sort $(wildcard ./modules/*.mk))
|
|
-include $(SUBTARGET_MODULES)
|