From 5b706112c14789bccff4805189b8c65c938c9d32 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Dec 2010 19:19:35 +0100 Subject: cosmetic change, use the binary not the link --- package/xorg-server/files/xorg-server.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xorg-server/files/xorg-server.postinst b/package/xorg-server/files/xorg-server.postinst index 4d8403d7d..e26e54f3f 100644 --- a/package/xorg-server/files/xorg-server.postinst +++ b/package/xorg-server/files/xorg-server.postinst @@ -1,5 +1,5 @@ #!/bin/sh -if [ -z $IPKG_INSTROOT ];then chmod u+s /usr/bin/X;fi +if [ -z $IPKG_INSTROOT ];then chmod u+s /usr/bin/Xorg;fi . $IPKG_INSTROOT/etc/functions.sh gid=$(get_next_gid) add_group video $gid -- cgit v1.2.3 From 4f6007861e1b6a440ba1b48af0120678c63fa3c4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Dec 2010 19:19:53 +0100 Subject: update package, simplify --- package/rrdcollect/Makefile | 23 +++------ package/rrdcollect/files/rrdcollect.conf | 26 +++++----- package/rrdcollect/files/rrdcollect.init | 9 +--- package/rrdcollect/patches/rrdcollect-scan.patch | 66 ------------------------ 4 files changed, 21 insertions(+), 103 deletions(-) delete mode 100644 package/rrdcollect/patches/rrdcollect-scan.patch diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile index 1a025f37e..f4d562e3a 100644 --- a/package/rrdcollect/Makefile +++ b/package/rrdcollect/Makefile @@ -4,25 +4,22 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rrdcollect -PKG_VERSION:= 0.2.3 -PKG_RELEASE:= 8 -PKG_MD5SUM:= 5e4305c612bc3cccbaf802c275c81a11 +PKG_VERSION:= 0.2.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1e94eb0f8d55ebf0f042c10baebc2d3d PKG_DESCR:= Round-Robin Database (RRD) collecting daemon PKG_SECTION:= admin PKG_DEPENDS:= librrd PKG_BUILDDEP:= rrdtool PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rrdcollect/} -PKG_SUBPKGS:= RRDCOLLECT RRDCOLLECT_EXAMPLE - ifneq (${ADK_PACKAGE_LIBRRD},) -RRDTOOL_LIBS:=-lart_lgpl_2 -lfreetype -lpng +RRDTOOL_LIBS:= -lart_lgpl_2 -lfreetype -lpng endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= LIBS="${RRDTOOL_LIBS} -lz" \ ac_cv_func_malloc_0_nonnull=yes @@ -37,14 +34,8 @@ post-install: ${INSTALL_DIR} ${IDIR_RRDCOLLECT}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/rrdcollect \ ${IDIR_RRDCOLLECT}/usr/sbin/ - ${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/etc - ${INSTALL_DATA} ./files/rrd.conf ./files/rrdcollect.conf \ - ${IDIR_RRDCOLLECT_EXAMPLE}/etc/ - ${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin - ${INSTALL_BIN} ./files/rrd.sh ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin/ - ${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin - ln -sf /var/lib/rrdcollect/rrd.cgi \ - ${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin/rrd.cgi - ln -sf /var/lib/rrdcollect/img ${IDIR_RRDCOLLECT_EXAMPLE}/www/img + ${INSTALL_DIR} ${IDIR_RRDCOLLECT}/etc + ${INSTALL_DATA} ./files/rrdcollect.conf \ + ${IDIR_RRDCOLLECT}/etc/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rrdcollect/files/rrdcollect.conf b/package/rrdcollect/files/rrdcollect.conf index e34c9bff7..392661e87 100644 --- a/package/rrdcollect/files/rrdcollect.conf +++ b/package/rrdcollect/files/rrdcollect.conf @@ -1,5 +1,5 @@ step = 360 -directory = /var/lib/rrdcollect/rrd +directory = /var/lib/rrdcollect file:///proc/stat "cpu0 %d %d %d %d" SYS.rrd:cu,cn,cs,ci @@ -14,20 +14,20 @@ file:///proc/meminfo file:///proc/loadavg "%f %f %f %d/%d %*d" SYS.rrd:l1,l2,l3,pr,pt -exec:///bin/df -"/dev/mtdblock/4 %*d %d %d" SYS.rrd:us,av +#exec:///bin/df +#"/dev/mtdblock/4 %*d %d %d" SYS.rrd:us,av # LAN: vlan0, WAN: vlan1, WIFI: eth1 -file:///proc/net/dev -" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo -" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo -" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo +#file:///proc/net/dev +#" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo +#" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo +#" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo #" tun0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo -file:///proc/slabinfo -"ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con -"arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp +#file:///proc/slabinfo +#"ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con +#"arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp -file:///proc/interrupts -" 4: %d MIPS eth1" SYS.rrd:irw -" 5: %d MIPS eth0" SYS.rrd:ire +#file:///proc/interrupts +#" 4: %d MIPS eth1" SYS.rrd:irw +#" 5: %d MIPS eth0" SYS.rrd:ire diff --git a/package/rrdcollect/files/rrdcollect.init b/package/rrdcollect/files/rrdcollect.init index 5c83ae013..478150e90 100644 --- a/package/rrdcollect/files/rrdcollect.init +++ b/package/rrdcollect/files/rrdcollect.init @@ -4,11 +4,6 @@ . /etc/rc.conf -LIB_D=/var/lib/rrdcollect -CGI_S=$LIB_D/rrd.cgi -RRD_D=$LIB_D/rrd -RRD_F=$(find $RRD_D -name "*.rrd" 2>/dev/null) - case $1 in autostop) ;; autostart) @@ -16,9 +11,7 @@ autostart) exec sh $0 start ;; start) - [ -d $LIB_D/img ] || mkdir -p $LIB_D/img - [ -n "$RRD_F" ] || /usr/bin/rrd.sh init - [ -x $CGI_S ] || /usr/bin/rrd.sh cgi + [ -d /var/lib/rrdcollect ] || mkdir -p /var/lib/rrdcollect rrdcollect ;; stop) diff --git a/package/rrdcollect/patches/rrdcollect-scan.patch b/package/rrdcollect/patches/rrdcollect-scan.patch deleted file mode 100644 index f47301ed1..000000000 --- a/package/rrdcollect/patches/rrdcollect-scan.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ruN rrdcollect-0.2.3.orig/src/scan.c rrdcollect-0.2.3/src/scan.c ---- rrdcollect-0.2.3.orig/src/scan.c 2005-01-20 18:42:17.000000000 +0100 -+++ rrdcollect-0.2.3/src/scan.c 2006-01-22 00:51:52.000000000 +0100 -@@ -74,6 +74,11 @@ - } while (isdigit(*fmt)); - } - -+ /* skip white spaces like scanf does */ -+ if (strchr("difuoxX", *fmt)) -+ while (isspace(*buf)) -+ buf++; -+ - /* FIXME: we should check afterward: - * if (start == buf || start == '-' && buf-start == 1) - * die("WTF??? zero-length number???"); -@@ -150,27 +155,22 @@ - buf++, length--; - } - -- /* ignore if value not found */ -- if(value == 0) -- return 0; -- - if (!ignore) -- counter[i++]->value = valuedup(value); -+ counter[i++]->value = strndup(start, buf - start); - break; - - case 'c': -+ if (length < 0) -+ length = 1; // default length is 1 -+ - while (*buf && length > 0) { - buf++, length--; - } - if (length > 0) - return 2; - -- /* ignore if value not found */ -- if(value == 0) -- return 0; -- - if (!ignore) -- counter[i++]->value = valuedup(value); -+ counter[i++]->value = strndup(start, buf - start); - break; - - -@@ -192,7 +192,7 @@ - case '\f': - case '\v': - /* don't match if not at least one space */ -- if(!isspace(*(buf))) -+ if(!isspace(*buf)) - return 0; - else - buf++; -@@ -208,7 +208,7 @@ - case '\v': - break; - default: -- while (isspace(*(buf))) -+ while (isspace(*buf)) - buf++; - } - fmt++; -- cgit v1.2.3 From 39f9801f2ad0e0e9468ef405f8e7b777f662491e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Dec 2010 19:21:11 +0100 Subject: optimize for ibm x40 hardware profile --- target/Config.in | 7 +++++++ target/Config.in.runtime | 2 +- target/Config.in.x86 | 1 + target/Config.in.x86_64 | 1 + target/linux/config/Config.in.block | 5 +++++ target/linux/config/Config.in.graphics | 1 + target/linux/config/Config.in.kvm | 2 +- target/linux/config/Config.in.misc | 18 ++++++++---------- 8 files changed, 25 insertions(+), 12 deletions(-) diff --git a/target/Config.in b/target/Config.in index 4a439031b..c8701859a 100644 --- a/target/Config.in +++ b/target/Config.in @@ -23,6 +23,9 @@ config ADK_TARGET_WITH_VGA config ADK_TARGET_WITH_HDD bool +config ADK_TARGET_WITH_SATA + bool + config ADK_TARGET_WITH_INPUT bool @@ -44,6 +47,9 @@ config ADK_TARGET_WITH_WATCHDOG config ADK_TARGET_WITH_DSL bool +config ADK_TARGET_CPU_WITH_VT + bool + config ADK_TOOLCHAIN_ONLY bool @@ -177,6 +183,7 @@ config ADK_CPU_PENTIUM_M boolean config ADK_CPU_AMDFAM10 + select ADK_TARGET_CPU_WITH_VT boolean config ADK_CPU_LOONGSON2F diff --git a/target/Config.in.runtime b/target/Config.in.runtime index 51f1d5653..b36880a3a 100644 --- a/target/Config.in.runtime +++ b/target/Config.in.runtime @@ -3,7 +3,7 @@ config ADK_RUNTIME_HOSTNAME string "hostname for the embedded system" - default "linux" + default "localhost" help Set your target hostname. diff --git a/target/Config.in.x86 b/target/Config.in.x86 index e7e98c65a..18dd6027a 100644 --- a/target/Config.in.x86 +++ b/target/Config.in.x86 @@ -15,6 +15,7 @@ config ADK_HARDWARE_IBM_X40 select ADK_ibm_x40 select ADK_CPU_PENTIUM_M select ADK_KERNEL_MPENTIUMM + select ADK_TARGET_WITH_CARDBUS select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_VGA diff --git a/target/Config.in.x86_64 b/target/Config.in.x86_64 index 053d05829..f3f6c6a77 100644 --- a/target/Config.in.x86_64 +++ b/target/Config.in.x86_64 @@ -21,6 +21,7 @@ config ADK_HARDWARE_SHUTTLE_SA76G2 bool "Shuttle PC" select ADK_shuttle_sa76g2 select ADK_CPU_AMDFAM10 + select ADK_TARGET_WITH_SATA select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_PCI diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 4415489c1..1812b5570 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -36,6 +36,9 @@ config ADK_KERNEL_ISCSI_TCP config ADK_KERNEL_DM_CRYPT boolean +config ADK_KERNEL_BLK_DEV + boolean + config ADK_KERNEL_BLK_DEV_DM boolean select ADK_KERNEL_MD @@ -67,6 +70,7 @@ config ADK_KERNEL_SATA_AHCI select ADK_KERNEL_BLOCK select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV_SD + depends on ADK_TARGET_WITH_SATA default y if ADK_HARDWARE_SHUTTLE default n @@ -282,6 +286,7 @@ config ADK_KPACKAGE_KMOD_DM_MIRROR config ADK_KPACKAGE_KMOD_BLK_DEV_DRBD prompt "kmod-blk-dev-drbd................. DRBD support (Network RAID 1)" tristate + select ADK_KERNEL_BLK_DEV select ADK_KERNEL_CONNECTOR help DRBD - http://www.drbd.org diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index dd4df958c..96814e733 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -38,6 +38,7 @@ config ADK_KERNEL_FB_GEODE_LX select ADK_KERNEL_FB select ADK_KERNEL_FRAMEBUFFER_CONSOLE select ADK_KERNEL_FB_GEODE + depends on ADK_LINUX_X86_ALIX default y if ADK_HARDWARE_ALIX1C default n help diff --git a/target/linux/config/Config.in.kvm b/target/linux/config/Config.in.kvm index 20aaa4f92..44ed992a4 100644 --- a/target/linux/config/Config.in.kvm +++ b/target/linux/config/Config.in.kvm @@ -1,5 +1,5 @@ menu "Virtualization" -depends on ADK_LINUX_X86_64 || ADK_LINUX_X86 +depends on (ADK_LINUX_X86_64 || ADK_LINUX_X86) && ADK_TARGET_CPU_WITH_VT config ADK_KERNEL_VIRTUALIZATION bool diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index a51d48ee3..0cf5819a0 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -23,9 +23,13 @@ config ADK_KERNEL_RFKILL config ADK_KERNEL_WATCHDOG boolean default n + +config ADK_KERNEL_I2C + boolean + default n config ADK_KERNEL_I2C_CHARDEV - boolean + tristate default n config ADK_KERNEL_RTC_CLASS @@ -49,6 +53,7 @@ config ADK_KERNEL_GEODE_WDT select ADK_KERNEL_MISC_DEVICES select ADK_KERNEL_CS5535_MFGPT select ADK_KERNEL_CS5535_CLOCK_EVENT_SRC + depends on ADK_LINUX_X86_ALIX default y if ADK_HARDWARE_ALIX2D2 default y if ADK_HARDWARE_ALIX2D13 default n @@ -66,18 +71,11 @@ config ADK_KERNEL_RTC_DRV_CMOS help RTC support for ALIX boards. -config ADK_KPACKAGE_KMOD_I2C - prompt "kmod-i2c.......................... I2C support" - tristate - select ADK_KERNEL_I2C_CHARDEV - default n - help - I2C support - config ADK_KPACKAGE_KMOD_SCx200_ACB prompt "kmod-i2c-geode.................... I2C driver for Geode" tristate - depends on ADK_KPACKAGE_KMOD_I2C + select ADK_KERNEL_I2C + select ADK_KERNEL_I2C_CHARDEV depends on ADK_LINUX_X86_ALIX default n help -- cgit v1.2.3 From e6f90cce4297eb75ed4896467271d34b9ee41688 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Dec 2010 19:21:41 +0100 Subject: fix broken module dependencies --- mk/modules.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mk/modules.mk b/mk/modules.mk index 3e0ecacfc..b0bdddc6d 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -22,6 +22,7 @@ $(eval $(call KMOD_template,KVM_INTEL,kvm-intel,\ # $(eval $(call KMOD_template,SATA_AHCI,sata-ahci,\ + $(MODULES_DIR)/kernel/drivers/ata/libahci \ $(MODULES_DIR)/kernel/drivers/ata/ahci \ ,10)) @@ -439,6 +440,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_TFTP,nf-conntrack-tftp,\ $(eval $(call KMOD_template,NF_CONNTRACK_PPTP,nf-conntrack-pptp,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_proto_gre \ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_pptp \ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_proto_gre \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_pptp \ ,55)) @@ -722,11 +724,13 @@ $(eval $(call KMOD_template,MD_RAID1,md-raid1,\ ,35)) $(eval $(call KMOD_template,MD_RAID456,md-raid456,\ + $(MODULES_DIR)/kernel/lib/raid6/raid6_pq \ $(MODULES_DIR)/kernel/crypto/xor \ $(MODULES_DIR)/kernel/crypto/async_tx/async_tx \ $(MODULES_DIR)/kernel/crypto/async_tx/async_xor \ $(MODULES_DIR)/kernel/crypto/async_tx/async_memcpy \ $(MODULES_DIR)/kernel/crypto/async_tx/async_raid6_recov \ + $(MODULES_DIR)/kernel/crypto/async_tx/async_pq \ $(MODULES_DIR)/kernel/drivers/md/raid456 \ ,35)) @@ -1134,7 +1138,7 @@ $(eval $(call KMOD_template,PCCARD,pccard,\ ,40)) $(eval $(call KMOD_template,YENTA,yenta,\ - $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic \ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_rsrc \ $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket \ ,50)) @@ -1587,6 +1591,7 @@ $(eval $(call KMOD_template,PLIP,plip,\ # # Profiling # + $(eval $(call KMOD_template,OPROFILE,oprofile,\ $(MODULES_DIR)/kernel/arch/$(ARCH)/oprofile/oprofile \ ,10)) -- cgit v1.2.3 From e1c9c0deace4fc8a79d848a2f05560ecdd7d4807 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Dec 2010 19:22:14 +0100 Subject: remove empty line --- mk/kernel-vars.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 2f238c2c6..48b7023b5 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -5,4 +5,3 @@ 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="${HOSTCC}" endif - -- cgit v1.2.3 From 1d8f51334df12e4049a4a1c6f642bdb06e09136a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Dec 2010 19:23:16 +0100 Subject: optimize hostname stuff, use localhost as default --- package/base-files/Makefile | 16 ++++++---------- package/base-files/src/etc/hosts | 4 ++-- package/base-files/src/etc/sysctl.conf | 1 - 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index e0cadbf9a..9659fe685 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 36 +PKG_RELEASE:= 37 PKG_SECTION:= base PKG_DESCR:= basic files and scripts @@ -43,14 +43,10 @@ endif ifneq (${ADK_PACKAGE_ZSH},) echo /bin/zsh >>${IDIR_BASE_FILES}/etc/shells endif - mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt} mkdir -p $(IDIR_BASE_FILES)/etc/crontabs - mkdir -p $(IDIR_BASE_FILES)/etc/network/if-pre-up.d - mkdir -p $(IDIR_BASE_FILES)/etc/network/if-up.d - mkdir -p $(IDIR_BASE_FILES)/etc/network/if-down.d - mkdir -p $(IDIR_BASE_FILES)/etc/network/if-post-down.d - mkdir -p $(IDIR_BASE_FILES)/usr/lib - mkdir -p $(IDIR_BASE_FILES)/usr/bin + mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt} + mkdir -p $(IDIR_BASE_FILES)/etc/network/{if-pre-up.d,if-up.d,if-down.d,if-post-down.d} + mkdir -p $(IDIR_BASE_FILES)/usr/{lib,bin} chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init chmod 600 $(IDIR_BASE_FILES)/etc/shadow ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab @@ -65,8 +61,8 @@ endif test -z $(ADK_RUNTIME_CONSOLE_BOTH) || \ cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_HOSTNAME) || \ - echo $(ADK_RUNTIME_HOSTNAME) > \ - $(IDIR_BASE_FILES)/etc/hostname + echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \ + echo "127.0.0.1 $(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts test -z $(ADK_RUNTIME_PASSWORD) || \ $(SED) 's,\*NP\*,'"$$(${TOPDIR}/bin/tools/mkcrypt \ ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow diff --git a/package/base-files/src/etc/hosts b/package/base-files/src/etc/hosts index 87d837fc7..085363292 100644 --- a/package/base-files/src/etc/hosts +++ b/package/base-files/src/etc/hosts @@ -1,2 +1,2 @@ -::1 localhost -127.0.0.1 localhost +::1 localhost +127.0.0.1 localhost diff --git a/package/base-files/src/etc/sysctl.conf b/package/base-files/src/etc/sysctl.conf index f45e98632..51bccf6b0 100644 --- a/package/base-files/src/etc/sysctl.conf +++ b/package/base-files/src/etc/sysctl.conf @@ -15,4 +15,3 @@ net.ipv4.conf.default.rp_filter = 1 net.ipv4.conf.all.rp_filter = 1 # Enable SYN cookies #net.ipv4.tcp_syncookies = 1 - -- cgit v1.2.3 From 1ca706f0559b7a13f4f541aeaae71f824d837416 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Dec 2010 19:27:50 +0100 Subject: fix cross-compile on Darwin, update to latest upstream --- Makefile | 1 + package/firefox/Makefile | 13 ++++++++----- package/firefox/patches/patch-configure | 23 ++++++++++------------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 26f80c7cf..d1a29bd81 100644 --- a/Makefile +++ b/Makefile @@ -206,6 +206,7 @@ NO_ERROR=0 @echo 'HOSTCFLAGS:=-O2' >>prereq.mk @echo 'HOSTCXX:=${CXX}' >>prereq.mk @echo 'HOSTCXXFLAGS:=-O2' >>prereq.mk + @echo "HOST_LIBIDL_CONFIG:=$$(which libIDL-config-2)" >>prereq.mk @echo 'LANGUAGE:=C' >>prereq.mk @echo 'LC_ALL:=C' >>prereq.mk @echo 'MAKE:=$${GMAKE}' >>prereq.mk diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 35fea912d..b5a195c6f 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 3.6.12 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 80f4d83f23a7c45fc3f1904964ea2a5a +PKG_VERSION:= 3.6.13 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d7c90aed8209beefa74badf02e8eeae1 PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify @@ -18,7 +18,7 @@ PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ PKG_TARGET_DEPENDS:= alix x86 x86_64 mips mipsel mips64 mips64el -PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin !darwin +PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-1.9.2 @@ -37,7 +37,8 @@ endif CONFIGURE_ENV+= CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \ HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \ - HOST_LIBIDL_CONFIG="/usr/bin/libIDL-config-2" \ + HOST_LIBIDL_CONFIG="${HOST_LIBIDL_CONFIG}" \ + HOST_RANLIB="ranlib" HOST_AR="ar" \ CPPFLAGS="-I${STAGING_DIR}/usr/include/freetype2" \ ac_cv_sqlite_secure_delete=yes \ ac_cv_thread_keyword=no \ @@ -64,6 +65,8 @@ CONFIGURE_ARGS+= --enable-application=browser \ --disable-mathml \ --disable-crashreporter +XAKE_FLAGS+= OS_RELEASE="2.6" + post-install: $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index bb6138223..a5f6df0b9 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,5 +1,5 @@ --- mozilla-1.9.2.orig/configure 2010-10-27 05:09:28.000000000 +0200 -+++ mozilla-1.9.2/configure 2010-11-25 20:36:24.969435934 +0100 ++++ mozilla-1.9.2/configure 2010-12-12 12:03:54.000000000 +0100 @@ -3970,7 +3970,7 @@ else echo "$ac_t""yes" 1>&6 fi @@ -9,7 +9,15 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -17895,7 +17895,7 @@ echo "configure:17889: checking for SQLI +@@ -5625,7 +5625,6 @@ DIRENT_INO=d_ino + CYGWIN_WRAPPER= + WIN_TOP_SRC= + MOZ_USER_DIR=".mozilla" +-HOST_AR='$(AR)' + HOST_AR_FLAGS='$(AR_FLAGS)' + + MOZ_JPEG_CFLAGS= +@@ -17895,7 +17894,7 @@ echo "configure:17889: checking for SQLI else if test "$cross_compiling" = yes; then @@ -18,14 +26,3 @@ else cat > conftest.$ac_ext <