summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk6
-rw-r--r--mk/image.mk47
-rw-r--r--mk/kernel-build.mk5
-rw-r--r--mk/kernel-vars.mk6
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--mk/modules.mk24
-rw-r--r--mk/pkg-bottom.mk5
-rw-r--r--mk/rootfs.mk2
-rw-r--r--mk/vars.mk1
9 files changed, 84 insertions, 18 deletions
diff --git a/mk/build.mk b/mk/build.mk
index ad2d42b40..986d66cd7 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -18,6 +18,7 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_SIMPLE_NETWORK_CONFIG=n \
ADK_USE_CCACHE=n \
ADK_TOOLCHAIN_GDB=n \
+ ADK_PACKAGE_BASE_FILES=y \
ADK_PACKAGE_E2FSCK_STATIC=n \
ADK_PACKAGE_KEXECINIT=n \
ADK_PACKAGE_INSTALLER=n \
@@ -25,16 +26,13 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_PACKAGE_PACEMAKER=n \
ADK_PACKAGE_PACEMAKER_MGMTD=n \
ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \
- ADK_PACKAGE_OPENJDK=n \
ADK_PACKAGE_OPENJDK7=n \
ADK_PACKAGE_CLASSPATH=n \
ADK_PACKAGE_GRUB=n \
- ADK_PACKAGE_BASE_FILES=y \
ADK_PACKAGE_CRYPTINIT=n \
ADK_PACKAGE_PAM=n \
ADK_PACKAGE_VIRTINST=n \
ADK_PACKAGE_URLGRABBER=n \
- ADK_PACKAGE_PERL=n \
ADK_PACKAGE_LIBSSP=n \
ADK_PACKAGE_OPENAFS=n \
ADK_PKG_XORG=n \
@@ -100,7 +98,7 @@ POSTCONFIG= -@\
touch .rebuild.busybox;\
rebuild=1;\
fi; \
- for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE;do \
+ for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE ADK_TARGET_QEMU_MICROBLAZE_MODEL;do \
if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \
touch .rebuild.base-files;\
rebuild=1;\
diff --git a/mk/image.mk b/mk/image.mk
index 7c519d7f5..79d6102c6 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -119,6 +119,7 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_FS}-kernel
INITRAMFS= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
+ROOTFSJFFS2= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-jffs2.img
ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
ROOTFSISO= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso
@@ -126,6 +127,7 @@ else
TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel
INITRAMFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
+ROOTFSJFFS2= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-jffs2.img
ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
ROOTFSISO= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso
@@ -161,41 +163,76 @@ ${BIN_DIR}/${INITRAMFS}: ${BIN_DIR}/${INITRAMFS}_list
${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \
- ${BUILD_DIR}/root.squashfs \
+ ${BUILD_DIR}/root.squashfs -comp xz \
-nopad -noappend -root-owned $(MAKE_TRACE)
+${BIN_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
+ ${STAGING_HOST_DIR}/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \
+ --pad=$(ADK_TARGET_MTD_SIZE) -o ${BIN_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
+
createinitramfs: ${BIN_DIR}/${INITRAMFS}_list
${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \
${LINUX_DIR}/.config
( \
echo "CONFIG_BLK_DEV_INITRD=y"; \
echo 'CONFIG_INITRAMFS_SOURCE="${BIN_DIR}/${INITRAMFS}_list"'; \
- echo 'CONFIG_INITRAMFS_COMPRESSION_NONE is not set' >> ${LINUX_DIR}/.config; \
+ echo '# CONFIG_INITRAMFS_COMPRESSION_NONE is not set' >> ${LINUX_DIR}/.config; \
+ echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> ${LINUX_DIR}/.config; \
+ echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> ${LINUX_DIR}/.config; \
) >> ${LINUX_DIR}/.config
ifeq ($(ADK_KERNEL_COMP_XZ),y)
+ echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
echo "CONFIG_RD_XZ=y" >> ${LINUX_DIR}/.config
echo "CONFIG_INITRAMFS_COMPRESSION_XZ=y" >> ${LINUX_DIR}/.config
+ echo "CONFIG_XZ_DEC_X86=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_XZ_DEC_POWERPC=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_XZ_DEC_IA64=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_XZ_DEC_ARM=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_XZ_DEC_ARMTHUMB=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_XZ_DEC_SPARC=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_XZ_DEC_TEST=n" >> ${LINUX_DIR}/.config
endif
ifeq ($(ADK_KERNEL_COMP_LZMA),y)
+ echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
echo "CONFIG_RD_LZMA=y" >> ${LINUX_DIR}/.config
echo "CONFIG_INITRAMFS_COMPRESSION_LZMA=y" >> ${LINUX_DIR}/.config
endif
ifeq ($(ADK_KERNEL_COMP_LZO),y)
+ echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
echo "CONFIG_RD_LZO=y" >> ${LINUX_DIR}/.config
echo "CONFIG_INITRAMFS_COMPRESSION_LZO=y" >> ${LINUX_DIR}/.config
endif
ifeq ($(ADK_KERNEL_COMP_GZIP),y)
+ echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
echo "CONFIG_RD_GZIP=y" >> ${LINUX_DIR}/.config
echo "CONFIG_INITRAMFS_COMPRESSION_GZIP=y" >> ${LINUX_DIR}/.config
endif
ifeq ($(ADK_KERNEL_COMP_BZIP2),y)
+ echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
+ echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
echo "CONFIG_RD_BZIP2=y" >> ${LINUX_DIR}/.config
echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config
endif
@-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null
- echo N | \
- $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
- ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} oldconfig $(MAKE_TRACE)
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 59a68eb88..8fe0799a0 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -35,8 +35,13 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK
$(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR)/mk/modules.mk
$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure
-for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done
+ifeq ($(ADK_USE_KERNEL_MINICONFIG),y)
+ $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config
+ ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE)
+else
$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config
echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE)
+endif
${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE)
touch -c $(LINUX_DIR)/.config
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index e39e76a2d..cd5ef32ea 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -5,7 +5,8 @@ KERNEL_MAKE_OPTS:= -C "${LINUX_DIR}" V=1
ifneq ($(ADK_NATIVE),y)
KERNEL_MAKE_OPTS+= CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
CC="$(TARGET_CC)" HOSTCC="${CC_FOR_BUILD}" \
- HOSTCFLAGS='${CFLAGS_FOR_BUILD}'
+ HOSTCFLAGS='${CFLAGS_FOR_BUILD}' \
+ CONFIG_SHELL='${SHELL}'
endif
ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G},y)
ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 \
@@ -23,4 +24,5 @@ ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \
-DBCM47XX_OVERRIDE_CFESIZE=0x40000
endif
-KERNEL_MAKE_ENV+= KCPPFLAGS='${ADK_KCPPFLAGS}' PATH="$$PATH:${TOOLS_DIR}"
+KERNEL_MAKE_ENV+= KCPPFLAGS='${ADK_KCPPFLAGS}' \
+ PATH="${TOOLS_DIR}:$$PATH"
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index e4c368af5..ae4a99069 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -4,6 +4,12 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176
endif
+ifeq ($(ADK_KERNEL_VERSION_3_12_6),y)
+KERNEL_VERSION:= 3.12.6
+KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
+KERNEL_RELEASE:= 1
+KERNEL_MD5SUM:= ab2fcc368e20d804e77970196154fb9e
+endif
ifeq ($(ADK_KERNEL_VERSION_3_11_10),y)
KERNEL_VERSION:= 3.11.10
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
diff --git a/mk/modules.mk b/mk/modules.mk
index ae38b5f90..22afead3b 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -108,20 +108,36 @@ $(eval $(call KMOD_template,P54_USB,p54-usb,\
$(eval $(call KMOD_template,RT2X00,rt2x00,\
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \
- $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \
,17))
+$(eval $(call KMOD_template,RT2X00_LIB_PCI,rt2x00pci,\
+ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \
+,18))
+
+$(eval $(call KMOD_template,RT2X00_LIB_USB,rt2x00usb,\
+ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00usb \
+,18))
+
$(eval $(call KMOD_template,RT2400PCI,rt2400pci,\
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2400pci \
-,20, kmod-leds-class kmod-rt2x00))
+,20, kmod-leds-class kmod-rt2x00 rt2x00pci))
$(eval $(call KMOD_template,RT2500PCI,rt2500pci,\
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2500pci \
-,20, kmod-leds-class kmod-rt2x00))
+,20, kmod-leds-class kmod-rt2x00 kmod-rt2x00pci))
+
+$(eval $(call KMOD_template,RT2800USB,rt2800usb,\
+ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2800lib \
+ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2800usb \
+,20, kmod-rt2x00 kmod-rt2x00usb))
$(eval $(call KMOD_template,RT61PCI,rt61pci,\
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt61pci \
-,20, kmod-leds-class kmod-rt2x00))
+,20, kmod-leds-class kmod-rt2x00 rt2x00pci))
+
+$(eval $(call KMOD_template,RTL8192CU,rtl8192cu,\
+ $(MODULES_DIR)/kernel/drivers/net/wireless/rtl8192cu/8192cu \
+,20))
#
# Networking
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 0358c0382..288616a7c 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -151,7 +151,8 @@ endif
done
@for a in ${WRKINST}/usr/lib/pkgconfig/*.pc; do \
[[ -e $$a ]] || continue; \
- sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \
+ sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," \
+ -e "s,^prefix = .*,prefix = ${STAGING_TARGET_DIR}/usr," $$a > \
${STAGING_DIR}/usr/lib/pkgconfig/$$(basename $$a); \
done
ifeq (,$(filter noremove,${PKG_OPTS}))
@@ -180,7 +181,7 @@ ifneq (,$(filter dev,${PKG_OPTS}))
done
endif
@-cd ${WRKINST}; \
- if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \
+ if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" ];then \
find lib \( -name lib\*.so\* -o -name lib\*.a \) \
-exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \
' fix this!' >&2 \; -quit 2>/dev/null; fi;\
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 18d4f83dc..3bbe31f25 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -9,6 +9,7 @@ endif
endef
ifeq ($(ADK_HARDWARE_QEMU),y)
+MTDDEV:= root=/dev/mtdblock0
ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
ROOTFS:= root=/dev/sda1
endif
@@ -50,6 +51,7 @@ $(eval $(call rootfs_template,initramfs,INITRAMFS))
$(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK))
$(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS)))
$(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3))
+$(eval $(call rootfs_template,jffs2,JFFS2,$(MTDDEV) rootfstype=jffs2))
$(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init))
$(eval $(call rootfs_template,encrypted,ENCRYPTED))
$(eval $(call rootfs_template,iso,ISO))
diff --git a/mk/vars.mk b/mk/vars.mk
index 0525f5129..657d44ae5 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -136,7 +136,6 @@ FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh
SED:= sed -i -e
LINUX_DIR:= $(BUILD_DIR)/linux
-LINUX_HEADER_DIR:= $(STAGING_DIR)/linux-header
KERNEL_MODULE_FLAGS:= ARCH=${ARCH} KERNELVERSION="2.6" \
KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \
PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 10:53:18 +0000