diff options
-rw-r--r-- | mk/build.mk | 1 | ||||
-rw-r--r-- | mk/image.mk | 4 | ||||
-rw-r--r-- | package/busybox/Makefile | 2 | ||||
-rw-r--r-- | package/busybox/patches/0001-nameif-fix-parsing-proc-net-dev.patch | 31 | ||||
-rw-r--r-- | package/busybox/patches/0002-nameif-Added-matching-for-PhyAddresses.patch | 103 | ||||
-rw-r--r-- | package/e2fsprogs/Makefile | 10 | ||||
-rw-r--r-- | package/libfm/Makefile | 2 | ||||
-rw-r--r-- | package/libxml2/Makefile | 4 | ||||
-rw-r--r-- | package/libxml2/patches/patch-ltmain_sh | 14 | ||||
-rw-r--r-- | package/lxde-common/Makefile | 5 | ||||
-rw-r--r-- | package/lxdm/Makefile | 3 | ||||
-rw-r--r-- | package/lxdm/files/lxdm.init | 28 | ||||
-rw-r--r-- | package/lxdm/files/lxdm.postinst | 3 | ||||
-rw-r--r-- | package/lxdm/files/openadk.png | bin | 0 -> 115297 bytes | |||
-rw-r--r-- | package/pcmanfm/Makefile | 2 | ||||
-rw-r--r-- | package/ppp/Makefile | 1 | ||||
-rw-r--r-- | package/trafshow/Makefile | 2 | ||||
-rw-r--r-- | package/util-linux-ng/Makefile | 4 | ||||
-rw-r--r-- | toolchain/glibc/Makefile.inc | 2 | ||||
-rw-r--r-- | toolchain/glibc/patches/getpagesize.patch | 14 | ||||
-rw-r--r-- | tools/adk/depmaker.c | 2 |
21 files changed, 213 insertions, 24 deletions
diff --git a/mk/build.mk b/mk/build.mk index 4774106ee..32e125df9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -12,6 +12,7 @@ CONFIG_CONFIG_IN = Config.in CONFIG = config DEFCONFIG= ADK_DEBUG=n \ ADK_STATIC=n \ + ADK_LOCALES=n \ ADK_MAKE_PARALLEL=y \ ADK_MAKE_JOBS=4 \ ADK_USE_CCACHE=n \ diff --git a/mk/image.mk b/mk/image.mk index cbad4965f..e8a74aca6 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -113,9 +113,9 @@ createinitramfs: @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* $(MAKE_TRACE) echo N | \ $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ - ARCH=$(ARCH) CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) + 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)" $(MAKE_TRACE) + ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(MAKE_TRACE) imageclean: rm -f $(BIN_DIR)/$(ADK_TARGET_SYSTEM)-* ${BUILD_DIR}/$(ADK_TARGET_SYSTEM)-* diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 51cc30ddc..67884cf3e 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -38,7 +38,7 @@ BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \ HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ -C ${WRKBUILD} ifneq (${ADK_NATIVE},y) -BB_MAKE_FLAGS+= EXTRA_CFLAGS="${TARGET_CFLAGS}" CROSS_COMPILE="$(TARGET_CROSS)" +BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" endif # XXX: Although this looks like all new symbols are enabled when 'make oldconfig' runs, they're not. diff --git a/package/busybox/patches/0001-nameif-fix-parsing-proc-net-dev.patch b/package/busybox/patches/0001-nameif-fix-parsing-proc-net-dev.patch new file mode 100644 index 000000000..2c5ef6b41 --- /dev/null +++ b/package/busybox/patches/0001-nameif-fix-parsing-proc-net-dev.patch @@ -0,0 +1,31 @@ +From ea80044062500c7473cf214010576ea2681d8d2e Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil.sutter@viprinet.com> +Date: Thu, 3 Mar 2011 15:13:57 +0100 +Subject: [PATCH 1/2] nameif: fix parsing /proc/net/dev + +The parser field lineno is initially zero and incremented upon each +call to config_read(). So lineno is effectively a "real" line number, +not an index. Fix the off-by-one bug here, which led to parsing for an +interface named "face". + +Signed-off-by: Phil Sutter <phil.sutter@viprinet.com> +--- + networking/nameif.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/networking/nameif.c b/networking/nameif.c +index 6cf1c50..8e325e7 100644 +--- a/networking/nameif.c ++++ b/networking/nameif.c +@@ -174,7 +174,7 @@ int nameif_main(int argc, char **argv) + #if ENABLE_FEATURE_NAMEIF_EXTENDED + struct ethtool_drvinfo drvinfo; + #endif +- if (parser->lineno < 2) ++ if (parser->lineno < 3) + continue; /* Skip the first two lines */ + + /* Find the current interface name and copy it to ifr.ifr_name */ +-- +1.7.3.4 + diff --git a/package/busybox/patches/0002-nameif-Added-matching-for-PhyAddresses.patch b/package/busybox/patches/0002-nameif-Added-matching-for-PhyAddresses.patch new file mode 100644 index 000000000..e388c4c5b --- /dev/null +++ b/package/busybox/patches/0002-nameif-Added-matching-for-PhyAddresses.patch @@ -0,0 +1,103 @@ +From eb65132adca3fe1e7c39fc6032266a8d04150561 Mon Sep 17 00:00:00 2001 +From: Nico Erfurth <ne@erfurth.eu> +Date: Sun, 27 Feb 2011 17:57:30 +0100 +Subject: [PATCH 2/2] nameif: Added matching for PhyAddresses + +Very useful when trying to distinguish platform-devices served by the +same driver, which is actually quite common in embedded-devices. + +Signed-off-by: Nico Erfurth <ne@erfurth.eu> +Signed-off-by: Phil Sutter <phil.sutter@viprinet.com> +--- + networking/nameif.c | 33 +++++++++++++++++++++++++++++++++ + 1 files changed, 33 insertions(+), 0 deletions(-) + +diff --git a/networking/nameif.c b/networking/nameif.c +index 8e325e7..8d64b37 100644 +--- a/networking/nameif.c ++++ b/networking/nameif.c +@@ -38,6 +38,7 @@ typedef struct ethtable_s { + #if ENABLE_FEATURE_NAMEIF_EXTENDED + char *bus_info; + char *driver; ++ int32_t phy_address; + #endif + } ethtable_t; + +@@ -59,6 +60,25 @@ struct ethtool_drvinfo { + uint32_t eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ + uint32_t regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ + }; ++ ++struct ethtool_cmd { ++ __u32 cmd; ++ __u32 supported; /* Features this interface supports */ ++ __u32 advertising; /* Features this interface advertises */ ++ __u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */ ++ __u8 duplex; /* Duplex, half or full */ ++ __u8 port; /* Which connector port */ ++ __u8 phy_address; ++ __u8 transceiver; /* Which transceiver to use */ ++ __u8 autoneg; /* Enable or disable autonegotiation */ ++ __u32 maxtxpkt; /* Tx pkts before generating tx int */ ++ __u32 maxrxpkt; /* Rx pkts before generating rx int */ ++ __u16 speed_hi; ++ __u16 reserved2; ++ __u32 reserved[3]; ++}; ++ ++#define ETHTOOL_GSET 0x00000001 /* Get settings. */ + #define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */ + #endif + +@@ -74,6 +94,7 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector) + #endif + selector = skip_whitespace(selector); + #if ENABLE_FEATURE_NAMEIF_EXTENDED ++ ch->phy_address = -1; + if (*selector == '\0') + break; + /* Search for the end .... */ +@@ -87,6 +108,9 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector) + } else if (strncmp(selector, "driver=", 7) == 0) { + ch->driver = xstrdup(selector + 7); + found_selector++; ++ } else if (strncmp(selector, "phyaddr=", 8) == 0) { ++ ch->phy_address = atoi(selector + 8); ++ found_selector++; + } else { + #endif + lmac = xmalloc(ETH_ALEN); +@@ -173,6 +197,7 @@ int nameif_main(int argc, char **argv) + struct ifreq ifr; + #if ENABLE_FEATURE_NAMEIF_EXTENDED + struct ethtool_drvinfo drvinfo; ++ struct ethtool_cmd eth_settings; + #endif + if (parser->lineno < 3) + continue; /* Skip the first two lines */ +@@ -182,6 +207,12 @@ int nameif_main(int argc, char **argv) + strncpy_IFNAMSIZ(ifr.ifr_name, token[0]); + + #if ENABLE_FEATURE_NAMEIF_EXTENDED ++ /* Check for phy address */ ++ memset(ð_settings, 0, sizeof(struct ethtool_cmd)); ++ eth_settings.cmd = ETHTOOL_GSET; ++ ifr.ifr_data = (caddr_t) ð_settings; ++ ioctl(ctl_sk, SIOCETHTOOL, &ifr); ++ + /* Check for driver etc. */ + memset(&drvinfo, 0, sizeof(struct ethtool_drvinfo)); + drvinfo.cmd = ETHTOOL_GDRVINFO; +@@ -198,6 +229,8 @@ int nameif_main(int argc, char **argv) + continue; + if (ch->driver && strcmp(ch->driver, drvinfo.driver) != 0) + continue; ++ if (ch->phy_address != -1 && ch->phy_address != eth_settings.phy_address) ++ continue; + #endif + if (ch->mac && memcmp(ch->mac, ifr.ifr_hwaddr.sa_data, ETH_ALEN) != 0) + continue; +-- +1.7.3.4 + diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 0b8a69eea..8c8788b2a 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -58,7 +58,10 @@ MAKE_FLAGS+= BUILD_CC="${CC_FOR_BUILD}" \ BUILD_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" post-build: -ifeq ($(ADK_PACKAGE_E2FSCK_STATIC),y) + ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid + ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ + ${STAGING_DIR}/usr/include/uuid +ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),) ${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static ${INSTALL_DIR} ${WRKINST}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin @@ -111,9 +114,6 @@ libuuid-install: ${INSTALL_DIR} ${IDIR_LIBUUID}/usr/lib ${CP} ${WRKINST}/usr/lib/libuuid.so* \ ${IDIR_LIBUUID}/usr/lib - ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid - ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ - ${STAGING_DIR}/usr/include/uuid libuuid-dev-install: ${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include @@ -121,8 +121,10 @@ libuuid-dev-install: ${IDIR_LIBUUID_DEV}/usr/include e2fsck-static-install: +ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),) ${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck.static \ ${IDIR_E2FSCK_STATIC}/usr/sbin/e2fsck +endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libfm/Makefile b/package/libfm/Makefile index 6e48a6784..bc2b5a9b9 100644 --- a/package/libfm/Makefile +++ b/package/libfm/Makefile @@ -22,7 +22,7 @@ $(eval $(call PKG_template,LIBFM,libfm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN $(eval $(call PKG_template,LIBFM_DEV,libfm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CPPFLAGS_FOR_BUILD+= $(shell pkg-config --cflags glib-2.0) -LDFLAGS_FOR_BUILD+= $(shell pkg-config --libs glib-2.0) +LDFLAGS_FOR_BUILD+= $(shell pkg-config --libs glib-2.0) -L/usr/lib CONFIGURE_ARGS+= --disable-gtk-doc libfm-install: diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 01d4ba466..8bfe1bb20 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libxml2 -PKG_VERSION:= 2.7.6 +PKG_VERSION:= 2.7.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7740a8ec23878a2f50120e1faa2730f2 +PKG_MD5SUM:= 8127a65e8c3b08856093099b52599c86 PKG_DESCR:= XML C parser and toolkit PKG_SECTION:= libs PKG_DEPENDS:= zlib diff --git a/package/libxml2/patches/patch-ltmain_sh b/package/libxml2/patches/patch-ltmain_sh index e6279239d..e5746506c 100644 --- a/package/libxml2/patches/patch-ltmain_sh +++ b/package/libxml2/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- libxml2-2.7.6.orig/ltmain.sh 2009-10-06 18:39:54.000000000 +0200 -+++ libxml2-2.7.6/ltmain.sh 2011-01-14 00:34:35.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files +--- libxml2-2.7.8.orig/ltmain.sh 2010-11-04 18:28:10.000000000 +0100 ++++ libxml2-2.7.8/ltmain.sh 2011-04-25 06:55:46.857662605 +0200 +@@ -5091,7 +5091,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" diff --git a/package/lxde-common/Makefile b/package/lxde-common/Makefile index 622b4b2af..b59a4b91a 100644 --- a/package/lxde-common/Makefile +++ b/package/lxde-common/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= lxde-common PKG_VERSION:= 0.5.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= aac2f6f2efa53a6ac92e47e7f2a0c602 PKG_DESCR:= LXDE de-common manager PKG_SECTION:= x11/lxde @@ -22,6 +22,9 @@ lxde-common-install: $(INSTALL_DIR) $(IDIR_LXDE_COMMON)/usr/bin $(CP) $(WRKINST)/usr/bin/* \ $(IDIR_LXDE_COMMON)/usr/bin + $(INSTALL_DIR) $(IDIR_LXDE_COMMON)/usr/share/lxpanel/profile/LXDE + $(CP) $(WRKINST)/usr/share/lxpanel/profile/LXDE/* \ + $(IDIR_LXDE_COMMON)/usr/share/lxpanel/profile/LXDE $(INSTALL_DIR) $(IDIR_LXDE_COMMON)/usr/share/lxde $(CP) $(WRKINST)/usr/share/lxde/* \ $(IDIR_LXDE_COMMON)/usr/share/lxde diff --git a/package/lxdm/Makefile b/package/lxdm/Makefile index 555194a3d..4f0036360 100644 --- a/package/lxdm/Makefile +++ b/package/lxdm/Makefile @@ -30,5 +30,8 @@ lxdm-install: $(INSTALL_DIR) $(IDIR_LXDM)/usr/share/lxdm/themes $(CP) $(WRKINST)/usr/share/lxdm/themes/* \ $(IDIR_LXDM)/usr/share/lxdm/themes + $(INSTALL_DIR) $(IDIR_LXDM)/usr/share/backgrounds + $(CP) ./files/openadk.png \ + $(IDIR_LXDM)/usr/share/backgrounds/default.png include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lxdm/files/lxdm.init b/package/lxdm/files/lxdm.init new file mode 100644 index 000000000..40ece255b --- /dev/null +++ b/package/lxdm/files/lxdm.init @@ -0,0 +1,28 @@ +#!/bin/sh +#PKG lxdm +#INIT 95 + +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${lxdm:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + /usr/sbin/lxdm + ;; +stop) + kill $(pgrep -f /usr/sbin/lxdm) + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/lxdm/files/lxdm.postinst b/package/lxdm/files/lxdm.postinst new file mode 100644 index 000000000..4a038c74d --- /dev/null +++ b/package/lxdm/files/lxdm.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf lxdm lxdm YES diff --git a/package/lxdm/files/openadk.png b/package/lxdm/files/openadk.png Binary files differnew file mode 100644 index 000000000..70f9c3bcd --- /dev/null +++ b/package/lxdm/files/openadk.png diff --git a/package/pcmanfm/Makefile b/package/pcmanfm/Makefile index 187c4da2a..500f4c41b 100644 --- a/package/pcmanfm/Makefile +++ b/package/pcmanfm/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PCMANFM,pcmanfm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CPPFLAGS_FOR_BUILD+= $(shell pkg-config --cflags glib-2.0) -LDFLAGS_FOR_BUILD+= $(shell pkg-config --libs glib-2.0) +LDFLAGS_FOR_BUILD+= $(shell pkg-config --libs glib-2.0) -L/usr/lib CONFIGURE_ARGS+= --disable-gtk-doc pcmanfm-install: diff --git a/package/ppp/Makefile b/package/ppp/Makefile index bf50e6281..250089b4b 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -10,6 +10,7 @@ PKG_MD5SUM:= 4621bc56167b6953ec4071043fe0ec57 PKG_DESCR:= Point-to-Point Protocol software PKG_SECTION:= ppp PKG_DEPENDS:= kmod-ppp +PKG_BUILDDEP:= libpcap PKG_URL:= http://ppp.samba.org/ PKG_SITES:= ftp://ftp.samba.org/pub/ppp/ PKG_MULTI:= 1 diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile index 17d9879db..5cdc7c739 100644 --- a/package/trafshow/Makefile +++ b/package/trafshow/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= traffic analyzing tool PKG_SECTION:= net PKG_BUILDDEP:= libpcap ncurses PKG_DEPENDS:= libpcap libncurses libpthread -PKG_SITES:= http://www.sfr-fresh.com/linux/misc/ +PKG_SITES:= http://openadk.org/distfiles PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index 5866f5135..7cdacf554 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -37,8 +37,8 @@ $(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_D CONFIGURE_ARGS+= --disable-use-tty-group \ --disable-schedutils \ --disable-cramfs \ - --enable-libuuid \ - --enable-libblkid \ + --disable-libuuid \ + --disable-libblkid \ --enable-libmount \ --enable-mount MAKE_FLAGS+= OPT="${TARGET_CFLAGS}" ARCH="${ARCH}" diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index a9f838300..c332ddb89 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -3,7 +3,7 @@ PKG_NAME:= glibc PKG_VERSION:= 2.13 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= fafabe01cb9748acb0a11a6879ebaa7e PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ diff --git a/toolchain/glibc/patches/getpagesize.patch b/toolchain/glibc/patches/getpagesize.patch new file mode 100644 index 000000000..de9b73213 --- /dev/null +++ b/toolchain/glibc/patches/getpagesize.patch @@ -0,0 +1,14 @@ + This patch is needed at least on kirkwood. Otherwise DNS-lookups will fail, since + GLRO(dl_pagesize) is zero. Solution taken from this resource: + http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg228455.html +--- glibc-2.12.1/sysdeps/unix/sysv/linux/getpagesize.c.orig 2011-02-28 03:41:47.870001678 +0100 ++++ glibc-2.12.1/sysdeps/unix/sysv/linux/getpagesize.c 2011-02-28 03:42:16.712993932 +0100 +@@ -28,7 +28,7 @@ + int + __getpagesize () + { +-#ifdef __ASSUME_AT_PAGESIZE ++#if 0 + assert (GLRO(dl_pagesize) != 0); + return GLRO(dl_pagesize); + #else diff --git a/tools/adk/depmaker.c b/tools/adk/depmaker.c index 21958ffae..b2c5d0706 100644 --- a/tools/adk/depmaker.c +++ b/tools/adk/depmaker.c @@ -157,7 +157,7 @@ int main() { /* exclude manual maintained packages from package/Makefile */ if (!(strncmp(pkgdirp->d_name, "eglibc", 6) == 0) && !(strncmp(pkgdirp->d_name, "libc", 4) == 0) && - !(strncmp(pkgdirp->d_name, "libpthread", 10) == 0) && + !(strncmp(pkgdirp->d_name, "libpthread", 10) == 0 && strlen(pkgdirp->d_name) == 10) && !(strncmp(pkgdirp->d_name, "uclibc++", 8) == 0) && !(strncmp(pkgdirp->d_name, "uclibc", 6) == 0) && !(strncmp(pkgdirp->d_name, "glibc", 5) == 0)) { |