summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/modules.mk4
-rw-r--r--package/aiccu/Makefile4
-rw-r--r--package/aiccu/patches/patch-common_common_h12
-rw-r--r--package/aiccu/src/common/dn_skipname.c10
-rw-r--r--package/atftp/Makefile2
-rw-r--r--package/pcc/Makefile12
-rw-r--r--target/linux/config/Config.in.audio3
-rw-r--r--target/linux/config/Config.in.block4
-rw-r--r--target/linux/config/Config.in.netdevice16
9 files changed, 49 insertions, 18 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index 52678042c..e8a0821de 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1294,7 +1294,7 @@ $(eval $(call KMOD_template,PCMCIA,pcmcia,\
,60))
$(eval $(call KMOD_template,SERIAL_8250_CS,serial-8250-cs,\
- $(MODULES_DIR)/kernel/drivers/tty/serial/serial_cs \
+ $(MODULES_DIR)/kernel/drivers/tty/serial/8250/serial_cs \
,70))
#
@@ -1743,7 +1743,7 @@ $(eval $(call KMOD_template,PARPORT_PC,parport-pc,\
,55))
$(eval $(call KMOD_template,PLIP,plip,\
- $(MODULES_DIR)/kernel/drivers/net/plip \
+ $(MODULES_DIR)/kernel/drivers/net/plip/plip \
,60))
#
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index d009394f7..407c3a65c 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= aiccu
PKG_VERSION:= 20070115
-PKG_RELEASE:= 10
+PKG_RELEASE:= 11
PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350
PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility
PKG_SECTION:= ipv6
@@ -13,6 +13,8 @@ PKG_DEPENDS:= kmod-ipv6 kmod-tun libpthread
PKG_URL:= http://www.sixxs.net/
PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/
+PKG_LIBC_DEPENDS:= uclibc glibc
+
DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).tar.gz
WRKDIST= ${WRKDIR}/$(PKG_NAME)
diff --git a/package/aiccu/patches/patch-common_common_h b/package/aiccu/patches/patch-common_common_h
new file mode 100644
index 000000000..42cd7b5a2
--- /dev/null
+++ b/package/aiccu/patches/patch-common_common_h
@@ -0,0 +1,12 @@
+--- aiccu.orig/common/common.h 2007-01-11 15:50:51.000000000 +0100
++++ aiccu/common/common.h 2014-03-16 21:47:28.000000000 +0100
+@@ -91,7 +91,9 @@
+ #include <sys/select.h>
+
+ #include <net/if.h>
++#ifdef __GLIBC__
+ #include <netinet/if_ether.h>
++#endif
+ #ifdef linux
+ #include <netpacket/packet.h>
+ #include <linux/if_tun.h>
diff --git a/package/aiccu/src/common/dn_skipname.c b/package/aiccu/src/common/dn_skipname.c
index f2219f335..3b4a756b9 100644
--- a/package/aiccu/src/common/dn_skipname.c
+++ b/package/aiccu/src/common/dn_skipname.c
@@ -9,10 +9,10 @@
* return:
* 0 on success, -1 (with errno set) on failure.
*/
-int ns_name_skip(const u_char **ptrptr, const u_char *eom)
+int ns_name_skip(const unsigned char **ptrptr, const unsigned char *eom)
{
- const u_char *cp;
- u_int n;
+ const unsigned char *cp;
+ unsigned int n;
cp = *ptrptr;
while (cp < eom && (n = *cp++) != 0)
@@ -40,9 +40,9 @@ int ns_name_skip(const u_char **ptrptr, const u_char *eom)
return (0);
}
-int dn_skipname(const u_char *ptr, const u_char *eom)
+int dn_skipname(const unsigned char *ptr, const unsigned char *eom)
{
- const u_char *saveptr = ptr;
+ const unsigned char *saveptr = ptr;
if(ns_name_skip(&ptr, eom) == -1)
return (-1);
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 598f58a06..7d5eefa66 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= readline ncurses
PKG_URL:= http://freshmeat.net/projects/atftp/
PKG_SITES:= ftp://ftp.mamalinux.com/pub/atftp/
+PKG_LIBC_DEPENDS:= uclibc glibc
+
PKG_SUBPKGS:= ATFTP ATFTPD
PKGSD_ATFTPD:= TFTP server
PKGSS_ATFTPD:= libreadline libncurses
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index 891651d3a..ef3e70b28 100644
--- a/package/pcc/Makefile
+++ b/package/pcc/Makefile
@@ -22,19 +22,17 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,PCC,pcc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
# we cross-compile a native compiler for the target system
-CONFIGURE_ARGS+= --host=${GNU_TARGET_NAME}
-CONFIGURE_ARGS+= --target=${GNU_TARGET_NAME}
-CONFIGURE_ARGS+= --with-assembler=/usr/bin/as
-CONFIGURE_ARGS+= --with-linker=/usr/bin/ld
+CONFIGURE_ARGS+= --host=${GNU_TARGET_NAME} \
+ --target=${GNU_TARGET_NAME} \
+ --with-assembler=/usr/bin/as \
+ --with-linker=/usr/bin/ld
ifeq ($(ADK_TARGET_LIB_GLIBC),y)
TARGET_CPPFLAGS+= -DADK_FOR_GLIBC
-else
+endif
ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
TARGET_CPPFLAGS+= -DADK_FOR_UCLIBC
endif
-endif
-endif
pcc-install:
$(INSTALL_DIR) $(IDIR_PCC)
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index cc84914d2..a1a5077e6 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -120,12 +120,13 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835
config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
prompt "kmod-snd-bcm2708-soc-i2s...... ALSA SOC I2S Raspberry PI"
+ tristate
select ADK_KPACKAGE_KMOD_SND
select ADK_KERNEL_SND_ARM
select ADK_KPACKAGE_KMOD_SND_SOC
select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE
select ADK_KPACKAGE_KMOD_SND_COMPRESS
- boolean
+ depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 0d1a28125..69addd11f 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -21,6 +21,7 @@ config ADK_KERNEL_IOSCHED_CFQ
config ADK_KERNEL_SCSI
boolean
+ default y if ADK_TARGET_SYSTEM_IBM_X40
config ADK_KERNEL_BLK_DEV_SD
boolean
@@ -252,7 +253,6 @@ config ADK_KPACKAGE_KMOD_SCSI
select ADK_KERNEL_LSF
select ADK_KERNEL_IOSCHED_AS
depends on !ADK_KERNEL_SCSI
- depends on !ADK_KERNEL_SATA_AHCI
tristate
help
If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or
@@ -268,7 +268,7 @@ config ADK_KPACKAGE_KMOD_SCSI
config ADK_KPACKAGE_KMOD_BLK_DEV_SD
prompt "kmod-scsi-disk.................... SCSI disk support"
- select ADK_KPACKAGE_KMOD_SCSI
+ select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI
depends on !ADK_KERNEL_BLK_DEV_SD
tristate
help
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 7aabc0b7e..62479c2cb 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -7,6 +7,18 @@ config ADK_KERNEL_NETDEVICES
config ADK_KERNEL_NET_ETHERNET
boolean
+config ADK_KERNEL_NET_VENDOR_NATSEMI
+ boolean
+
+config ADK_KERNEL_NET_VENDOR_8390
+ boolean
+
+config ADK_KERNEL_NET_VENDOR_REALTEK
+ boolean
+
+config ADK_KERNEL_NET_VENDOR_MARVELL
+ boolean
+
config ADK_KERNEL_PHYLIB
boolean
@@ -151,6 +163,8 @@ config ADK_KPACKAGE_KMOD_NE2K_PCI
select ADK_KERNEL_NETDEVICES
select ADK_KERNEL_NET_ETHERNET
select ADK_KERNEL_NET_PCI
+ select ADK_KERNEL_NET_VENDOR_NATSEMI
+ select ADK_KERNEL_NET_VENDOR_8390
select ADK_KERNEL_MII
default n
help
@@ -173,6 +187,7 @@ config ADK_KPACKAGE_KMOD_8139CP
select ADK_KERNEL_NETDEVICES
select ADK_KERNEL_NET_ETHERNET
select ADK_KERNEL_NET_PCI
+ select ADK_KERNEL_NET_VENDOR_REALTEK
select ADK_KERNEL_MII
default n
help
@@ -220,6 +235,7 @@ config ADK_KPACKAGE_KMOD_SKY2
select ADK_KERNEL_NETDEVICES
select ADK_KERNEL_NET_ETHERNET
select ADK_KERNEL_NETDEV_1000
+ select ADK_KERNEL_NET_VENDOR_MARVELL
depends on !ADK_KERNEL_SKY2
default n
help
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-25 15:28:56 +0000