summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk27
-rw-r--r--mk/image.mk48
-rw-r--r--mk/kernel-build.mk15
-rw-r--r--mk/kernel.mk2
-rw-r--r--mk/mirrors.mk2
-rw-r--r--mk/modules.mk51
-rw-r--r--mk/package.mk4
-rw-r--r--mk/vars.mk4
8 files changed, 89 insertions, 64 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 0d807076a..9b9c6ec8d 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -20,7 +20,6 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \
ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \
ADK_PACKAGE_AUFS2_UTIL=n \
ADK_PACKAGE_BASE_FILES=y \
- ADK_PACKAGE_GCC=n \
ADK_PACKAGE_MGETTY=n \
ADK_COMPILE_HEIMDAL=n \
ADK_PACKAGE_HEIMDAL_PKINIT=n \
@@ -65,8 +64,17 @@ noconfig_targets:= menuconfig \
POSTCONFIG= -@ \
if [ -f .config.old ];then \
- if [ -f .busyboxcfg ];then \
- rm .busyboxcfg; \
+ rebuild=0; \
+ if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
+ touch .rebuild.busybox;\
+ rebuild=1;\
+ fi; \
+ if [ "$$(grep ^ADK_RUNTIME_PASSWORD .config|md5sum)" != "$$(grep ^ADK_RUNTIME_PASSWORD .config.old|md5sum)" ];then \
+ touch .rebuild.base-files;\
+ rebuild=1;\
+ fi; \
+ if [ $$rebuild -eq 1 ];then \
+ cp .config .config.old; \
fi; \
fi
@@ -90,12 +98,12 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
ifeq ($(ADK_NATIVE),y)
- $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare target/config-prepare target/compile package/compile root_clean package/install package_index target/install
+ $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
else
ifeq ($(ADK_TOOLCHAIN_ONLY),y)
- $(MAKE) -f mk/build.mk toolchain/install package/compile
+ $(MAKE) -f mk/build.mk toolchain/install tools/install package/compile
else
- $(MAKE) -f mk/build.mk toolchain/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
+ $(MAKE) -f mk/build.mk toolchain/install tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
endif
endif
@@ -136,6 +144,9 @@ target/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
toolchain/%: ${STAGING_DIR}
$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+tools/%:
+ $(MAKE) -C tools $(patsubst tools/%,%,$@)
+
image:
$(MAKE) -C target image
@@ -164,7 +175,7 @@ newpackage:
$(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile
$(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile
@echo "Edit package/$(PKG)/Makefile to complete"
- @echo "Do not forget to add package to package/Config.in"
+ @echo "choose PKG_SECTION to add it to an existent submenu"
#############################################################
#
@@ -472,10 +483,12 @@ bulkallmod:
done <${TOPDIR}/target/bulk.lst
menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile)
+ @echo "Generating menu structure ..."
mksh $(TOPDIR)/package/pkgmaker
@:>.menu
dep:
+ @echo "Generating dependencies ..."
mksh $(TOPDIR)/package/depmaker
.PHONY: menu dep
diff --git a/mk/image.mk b/mk/image.mk
index 53b01d0c2..668de8c26 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -1,7 +1,7 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-imageprepare: kernel-install image-prepare-post extra-install
+imageprepare: image-prepare-post extra-install
# if an extra directory exist in TOPDIR, copy all content over the
# root directory, do the same if make extra=/dir/to/extra is used
@@ -13,37 +13,6 @@ image-prepare-post:
rng=/dev/arandom; test -e $$rng || rng=/dev/urandom; \
dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \
chmod 600 ${TARGET_DIR}/etc/.rnd
- @cd ${TARGET_DIR}; ls=; ln=; li=; x=1; md5sum $$(find . -type f) | \
- sed -e "s/*//" | \
- while read sum name; do \
- inode=$$(ls -i "$$name"); \
- echo "$$sum $${inode%% *} $$name"; \
- done | sort | while read sum inode name; do \
- if [[ $$sum = $$ls ]]; then \
- [[ $$li = $$inode ]] && continue; \
- case $$x in \
- 1) echo 'WARNING: duplicate files found' \
- 'in filesystem! Please fix them.' >&2; \
- echo -n "> $$ln "; \
- ;; \
- 2) echo -n "> $$ln "; \
- ;; \
- 3) echo -n ' '; \
- ;; \
- esac; \
- echo -n "$$name"; \
- x=3; \
- else \
- case $$x in \
- 3) echo; \
- x=2; \
- ;; \
- esac; \
- fi; \
- ls=$$sum; \
- ln=$$name; \
- li=$$inode; \
- done
chmod 4511 ${TARGET_DIR}/bin/busybox
chmod 1777 ${TARGET_DIR}/tmp
@if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \
@@ -52,13 +21,26 @@ image-prepare-post:
done; \
fi
+KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg
+KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(ADK_TARGET)-$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX)
+
+kernel-package: $(LINUX_DIR)/vmlinux
+ $(TRACE) target/$(ADK_TARGET)-create-kernel-package
+ rm -rf $(KERNEL_PKGDIR)
+ @mkdir -p $(KERNEL_PKGDIR)/boot
+ cp $(KERNEL) $(KERNEL_PKGDIR)/boot/vmlinuz-adk
+ ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \
+ ../linux/kernel.control ${ADK_TARGET}-${KERNEL_VERSION} ${CPU_ARCH}
+ $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR)
+ $(PKG_INSTALL) $(KERNEL_PKG)
+
INITRAMFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}
ROOTFSSQUASHFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}.img
ROOTFSTARBALL= ${ADK_TARGET}-${ADK_LIBC}-${FS}+kernel.tar.gz
ROOTFSUSERTARBALL= ${ADK_TARGET}-${ADK_LIBC}-${FS}.tar.gz
INITRAMFS_PIGGYBACK= ${ADK_TARGET}-${ADK_LIBC}-${FS}.cpio
-${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}
+${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
cd ${TARGET_DIR}; tar -cf - --owner=0 --group=0 . | gzip -n9 >$@
${BIN_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 11b5a4890..8ee6d1ac3 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -3,11 +3,8 @@
include $(TOPDIR)/rules.mk
include $(TOPDIR)/mk/linux.mk
-#include ${TOPDIR}/mk/buildhlp.mk
include ${TOPDIR}/mk/kernel-vars.mk
-KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg
-
$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched:
$(TRACE) target/$(ADK_TARGET)-kernel-patch
$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE)
@@ -37,17 +34,11 @@ $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config
INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \
modules_install $(MAKE_TRACE)
$(TRACE) target/$(ADK_TARGET)-create-packages
- $(MAKE) $(KERNEL_PKG) $(TARGETS)
+ifneq ($(strip $(TARGETS)),)
+ $(MAKE) $(TARGETS)
+endif
touch -c $(LINUX_DIR)/vmlinux
-$(KERNEL_PKG):
- $(TRACE) target/$(ADK_TARGET)-create-kernel-package
- rm -rf $(KERNEL_PKGDIR)
- @mkdir -p $(KERNEL_PKGDIR)/etc
- ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \
- ../linux/kernel.control ${ADK_TARGET}-${KERNEL_VERSION} ${CPU_ARCH}
- $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE)
-
prepare:
compile: $(LINUX_DIR)/vmlinux
install: compile
diff --git a/mk/kernel.mk b/mk/kernel.mk
index 33fbf5c2a..a8b3884da 100644
--- a/mk/kernel.mk
+++ b/mk/kernel.mk
@@ -1,7 +1,6 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-
LINUX_KMOD_SUFFIX=ko
MODULES_SUBDIR := lib/modules/$(KERNEL_VERSION)
LINUX_BUILD_DIR := $(BUILD_DIR)/linux-$(ARCH)-$(ADK_TARGET)
@@ -9,7 +8,6 @@ KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
-KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(ADK_TARGET)-$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX)
INSTALL_TARGETS:= $(KERNEL_PKG)
NOINSTALL_TARGETS:=
TARGETS:=
diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index c7e0ac623..a57cb8ec8 100644
--- a/mk/mirrors.mk
+++ b/mk/mirrors.mk
@@ -1,7 +1,7 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-MASTER_SITE_BACKUP?= ${MASTER_SITE_OPENADK}
+MASTER_SITE_BACKUP?= http://${ADK_HOST}/distfiles/
MASTER_SITE_OPENADK?= \
http://www.openadk.org/distfiles/ \
diff --git a/mk/modules.mk b/mk/modules.mk
index dbf651738..23f76df11 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -4,6 +4,7 @@
#
# Virtualization
#
+
$(eval $(call KMOD_template,KVM,kvm,\
$(MODULES_DIR)/kernel/arch/${ARCH}/kvm/kvm \
,90))
@@ -16,10 +17,10 @@ $(eval $(call KMOD_template,KVM_INTEL,kvm-intel,\
$(MODULES_DIR)/kernel/arch/${ARCH}/kvm/kvm-intel \
,95))
-
#
# Serial ATA devices
#
+
$(eval $(call KMOD_template,SATA_AHCI,sata-ahci,\
$(MODULES_DIR)/kernel/drivers/ata/ahci \
,10))
@@ -27,6 +28,7 @@ $(eval $(call KMOD_template,SATA_AHCI,sata-ahci,\
#
# Ethernet network devices
#
+
$(eval $(call KMOD_template,NE2K_PCI,ne2k-pci,\
$(MODULES_DIR)/kernel/drivers/net/8390 \
$(MODULES_DIR)/kernel/drivers/net/ne2k-pci \
@@ -52,10 +54,10 @@ $(eval $(call KMOD_template,SKY2,sky2,\
$(MODULES_DIR)/kernel/drivers/net/sky2 \
,20))
-
#
# Wireless network devices
#
+
$(eval $(call KMOD_template,MAC80211,mac80211,\
$(MODULES_DIR)/kernel/net/wireless/cfg80211 \
$(MODULES_DIR)/kernel/net/mac80211/mac80211 \
@@ -70,6 +72,10 @@ $(eval $(call KMOD_template,P54_COMMON,p54-common,\
$(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54common \
,68))
+$(eval $(call KMOD_template,RTL8187B,rtl8187b,\
+ $(MODULES_DIR)/kernel/drivers/net/wireless/rtl8187b/rtl8187b \
+,70))
+
$(eval $(call KMOD_template,B43,b43,\
$(MODULES_DIR)/kernel/drivers/net/wireless/b43/b43 \
,70))
@@ -98,6 +104,7 @@ $(eval $(call KMOD_template,RT61PCI,rt61pci,\
#
# Networking
#
+
$(eval $(call KMOD_template,ATM,atm,\
$(MODULES_DIR)/kernel/net/atm/atm \
,50))
@@ -166,6 +173,7 @@ $(eval $(call KMOD_template,BONDING,bonding,\
#
# Traffic scheduling
#
+
$(eval $(call KMOD_template,NET_SCH_CBQ,net-sch-cbq,\
$(MODULES_DIR)/kernel/net/sched/sch_cbq \
,40))
@@ -218,6 +226,7 @@ $(eval $(call KMOD_template,NET_SCH_INGRESS,net-sch-ingress,\
#
# classifications
#
+
$(eval $(call KMOD_template,NET_CLS_BASIC,net-cls-basic,\
$(MODULES_DIR)/kernel/net/sched/cls_basic \
,40))
@@ -241,6 +250,7 @@ $(eval $(call KMOD_template,NET_CLS_U32,net-cls-u32,\
#
# actions
#
+
$(eval $(call KMOD_template,NET_ACT_POLICE,net-act-police,\
$(MODULES_DIR)/kernel/net/sched/act_police \
,45))
@@ -264,6 +274,7 @@ $(eval $(call KMOD_template,NET_ACT_PEDIT,net-act-pedit,\
#
# IPsec
#
+
$(eval $(call KMOD_template,NET_KEY,net-key,\
$(MODULES_DIR)/kernel/net/key/af_key \
,60))
@@ -296,9 +307,11 @@ $(eval $(call KMOD_template,INET_XFRM_MODE_BEET,inet-xfrm-mode-beet,\
##
## Filtering / Firewalling
##
+
#
# Ethernet Bridging firewall
#
+
$(eval $(call KMOD_template,BRIDGE_NF_EBTABLES,bridge-nf-ebtables,\
$(MODULES_DIR)/kernel/net/bridge/netfilter/ebtables \
,55))
@@ -338,6 +351,7 @@ $(eval $(call KMOD_template,BRIDGE_EBT_REDIRECT,bridge-ebt-redirect,\
#
# Netfilter Core
#
+
$(eval $(call KMOD_template,NETFILTER_XT_TARGET_CLASSIFY,netfiler-xt-target-classify,\
$(MODULES_DIR)/kernel/net/netfilter/xt_CLASSIFY \
,50))
@@ -365,6 +379,7 @@ $(eval $(call KMOD_template,NETFILTER_XT_TARGET_NOTRACK,netfilter-xt-target-notr
#
# IP: Netfilter
#
+
$(eval $(call KMOD_template,NF_CONNTRACK,nf-conntrack,\
$(MODULES_DIR)/kernel/net/netfilter/nf_conntrack \
,45))
@@ -476,6 +491,7 @@ $(eval $(call KMOD_template,IP_NF_MATCH_MULTIPORT,ip-nf-match-multiport,\
#
# Filtering
#
+
$(eval $(call KMOD_template,IP_NF_FILTER,ip-nf-filter,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_filter \
,55))
@@ -511,6 +527,7 @@ $(eval $(call KMOD_template,IP_NF_TARGET_NETMAP,ip-nf-target-netmap,\
#
# Mangle
#
+
$(eval $(call KMOD_template,IP_NF_MANGLE,ip-nf-mangle,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_mangle \
,60))
@@ -530,6 +547,7 @@ $(eval $(call KMOD_template,IP_NF_TARGET_TTL,ip-nf-target-ttl,\
#
# IPv6: Netfilter
#
+
$(eval $(call KMOD_template,NF_CONNTRACK_IPV6,nf-conntrack-ipv6,\
$(MODULES_DIR)/kernel/net/ipv6/netfilter/nf_conntrack_ipv6 \
,50))
@@ -573,6 +591,7 @@ $(eval $(call KMOD_template,IP6_NF_TARGET_LOG,ip6-nf-target-log,\
#
# IPv6: Filtering
#
+
$(eval $(call KMOD_template,IP6_NF_FILTER,ip6-nf-filter,\
$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6table_filter \
,55))
@@ -584,6 +603,7 @@ $(eval $(call KMOD_template,IP6_NF_TARGET_REJECT,ip6-nf-target-reject,\
#
# IPv6: Mangle
#
+
$(eval $(call KMOD_template,IP6_NF_MANGLE,ip6-nf-mangle,\
$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6table_mangle \
,60))
@@ -645,6 +665,7 @@ $(eval $(call KMOD_template,IP_VS_FTP,ip-vs-ftp,\
#
# Block devices
#
+
$(eval $(call KMOD_template,BLK_DEV_LOOP,blk-dev-loop,\
$(MODULES_DIR)/kernel/drivers/block/loop \
,20))
@@ -670,6 +691,7 @@ $(eval $(call KMOD_template,BLK_DEV_SR,blk-dev-sr,\
#
# RAID
#
+
$(eval $(call KMOD_template,BLK_DEV_MD,blk-dev-md,\
$(MODULES_DIR)/kernel/drivers/md/md-mod \
,30))
@@ -695,6 +717,7 @@ $(eval $(call KMOD_template,MD_RAID456,md-raid456,\
#
# Device Mapper
#
+
$(eval $(call KMOD_template,BLK_DEV_DM,blk-dev-dm,\
$(MODULES_DIR)/kernel/drivers/md/dm-mod \
,35))
@@ -713,7 +736,6 @@ $(eval $(call KMOD_template,DM_SNAPSHOT,dm-snapshot,\
$(MODULES_DIR)/kernel/drivers/md/dm-snapshot \
,40))
-
#
# Crypto
#
@@ -898,6 +920,7 @@ $(eval $(call KMOD_template,OCF_TALITOS,ocf-talitos,\
#
# Filesystems
#
+
$(eval $(call KMOD_template,AUFS_FS,aufs-fs,\
$(MODULES_DIR)/kernel/fs/aufs/aufs \
,30))
@@ -997,6 +1020,7 @@ $(eval $(call KMOD_template,UDF_FS,udf-fs,\
#
# Multimedia
#
+
$(eval $(call KMOD_template,SOUND,sound,\
$(MODULES_DIR)/kernel/sound/soundcore \
,30))
@@ -1036,10 +1060,15 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\
$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
,55))
-$(eval $(call KMOD_template,VIDEODEV,videodev,\
+$(eval $(call KMOD_template,VIDEO_DEV,video-dev,\
+ $(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat \
$(MODULES_DIR)/kernel/drivers/media/video/videodev \
,65))
+$(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\
+ $(MODULES_DIR)/kernel/drivers/media/video/uvc/uvcvideo \
+,70))
+
$(eval $(call KMOD_template,PWC,pwc,\
$(MODULES_DIR)/kernel/drivers/usb/pwc \
,70))
@@ -1047,6 +1076,7 @@ $(eval $(call KMOD_template,PWC,pwc,\
#
# PCMCIA/CardBus
#
+
$(eval $(call KMOD_template,PCCARD,pccard,\
$(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core \
,40))
@@ -1146,6 +1176,10 @@ $(eval $(call KMOD_template,USB_PEGASUS,usb-pegasus,\
$(MODULES_DIR)/kernel/drivers/net/usb/pegasus \
,75))
+$(eval $(call KMOD_template,USB_HSO,usb-hso,\
+ $(MODULES_DIR)/kernel/drivers/net/usb/hso \
+,75))
+
$(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\
$(MODULES_DIR)/kernel/sound/usb/snd-usb-lib \
$(MODULES_DIR)/kernel/sound/usb/snd-usb-audio \
@@ -1223,10 +1257,10 @@ $(eval $(call KMOD_template,NETFILTER_XT_TARGET_LED,netfilter-xt-target-led,\
$(MODULES_DIR)/kernel/net/netfilter/xt_LED \
,90))
-
#
# NLS
#
+
$(eval $(call KMOD_template,NLS,nls,\
$(MODULES_DIR)/kernel/fs/nls/nls_base \
,10))
@@ -1393,7 +1427,10 @@ $(eval $(call KMOD_template,NLS_UTF8,nls-utf8, \
$(MODULES_DIR)/kernel/fs/nls/nls_utf8 \
,20))
+#
# ISDN
+#
+
ISDN_MODULES=drivers/isdn/i4l/isdn
$(eval $(call KMOD_template,ISDN,isdn, \
@@ -1450,7 +1487,10 @@ $(eval $(call KMOD_template,MISDN_SPEEDFAX,misdn-speedfax, \
$(MODULES_DIR)/kernel/drivers/isdn/hardware/mISDN/sedlfax \
,80))
+#
# Library modules
+#
+
$(eval $(call KMOD_template,CRC_CCITT,crc-ccitt, \
$(MODULES_DIR)/kernel/lib/crc-ccitt \
,01))
@@ -1473,6 +1513,7 @@ $(eval $(call KMOD_template,LIBCRC32C,libcrc32c, \
#
# parallel port support
+#
$(eval $(call KMOD_template,LP,lp,\
$(MODULES_DIR)/kernel/drivers/char/lp \
diff --git a/mk/package.mk b/mk/package.mk
index 98c2ecda9..acc387a48 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -161,7 +161,7 @@ IDEPEND_$(1):= $$(strip $(4))
_ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control
ICONTROL_$(1)?= $(WRKDIR)/.$(2).control
$$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
- @echo "Package: $(2)" > $(WRKDIR)/.$(2).control
+ @echo "Package: $$(shell echo $(2) | tr '_' '-')" > $(WRKDIR)/.$(2).control
@echo "Section: $(6)" >> $(WRKDIR)/.$(2).control
@echo "Description: $(5)" >> $(WRKDIR)/.$(2).control
${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH}
@@ -178,7 +178,7 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
comma=", "; \
last=$$$$dep; \
done; \
- echo "Depends: $$$$deps" >>$${IDIR_$(1)}/CONTROL/control; \
+ echo "Depends: $$$$deps" | tr '_' '-' >>$${IDIR_$(1)}/CONTROL/control; \
fi
@for file in conffiles preinst postinst prerm postrm; do \
[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
diff --git a/mk/vars.mk b/mk/vars.mk
index 42c534071..f26e07b6a 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -37,8 +37,8 @@ PACKAGE_DIR:= $(BIN_DIR)/packages
TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET}_${ADK_LIBC}
TARGET_DIR_PFX:= $(BASE_DIR)/root_*
TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
-REAL_GNU_TARGET_NAME= $(CPU_ARCH)-openadk-linux-$(ADK_TARGET_SUFFIX)
-GNU_TARGET_NAME= $(CPU_ARCH)-openadk-linux
+REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
+GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux
TOOLCHAIN_SYSROOT:= $(TOOLCHAIN_BUILD_DIR)/libc_dev
ifeq ($(ADK_NATIVE),y)
TARGET_CROSS:=
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 18:23:06 +0000