From 4da43e3f832083557df09175e7a4ecdc15299e78 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Sun, 12 Jun 2005 13:40:17 +0000 Subject: [PATCH] Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/12 15:15:24+02:00 (none)!br1 Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into null.(none):/data/mtx/src/build/unstable.wrt/openembedded 2005/06/12 15:14:45+02:00 (none)!br1 wrt updates: build all utilities in wrt-utils, they are highly interdepended 2005/06/12 14:11:29+01:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/oe/openembedded 2005/06/12 14:10:57+01:00 rpsys.net!RP Add oprofile_cvs + upgrade oprofile-0.8 to 0.9 2005/06/12 15:04:17+02:00 handhelds.org!zecke QPE Gaim: Update from gaim-1.3.0 to gaim-1.3.1 to fix two security issues BKrev: 42ac3b41-sC-tguzQt9KHLSJbcM0zg --- conf/machine/wrt54.conf | 14 +----------- packages/meta/nylon-image-mini.bb | 22 +++++++++++++++++++ .../acinclude.m4 | 0 .../no_arm_mapping_syms.patch | 0 .../acinclude.m4} | 0 .../oprofile/no_arm_mapping_syms.patch} | 0 .../nvram.bb => oprofile/oprofile_0.9.bb} | 0 .../oprofile_cvs.bb} | 0 .../qpe-libgaim_1.3.1.bb} | 0 packages/wrt/wrt-imagetools-native.bb | 0 packages/wrt/wrt-utils.bb | 0 .../wrt/wrt-utils/libshared-makefile.diff | 0 packages/wrt/wrt-utils/nvram-makefile.diff | 0 13 files changed, 23 insertions(+), 13 deletions(-) rename packages/oprofile/{oprofile-0.8 => oprofile-0.9}/acinclude.m4 (100%) rename packages/oprofile/{oprofile-0.8 => oprofile-0.9}/no_arm_mapping_syms.patch (100%) rename packages/oprofile/{oprofile_0.8.bb => oprofile/acinclude.m4} (100%) rename packages/{qpe-gaim/qpe-libgaim_1.3.0.bb => oprofile/oprofile/no_arm_mapping_syms.patch} (100%) rename packages/{wrt/nvram.bb => oprofile/oprofile_0.9.bb} (100%) rename packages/{wrt/nvram/nvram-Makefile.diff => oprofile/oprofile_cvs.bb} (100%) rename packages/{wrt/wrt-utils-native.bb => qpe-gaim/qpe-libgaim_1.3.1.bb} (100%) create mode 100644 packages/wrt/wrt-imagetools-native.bb create mode 100644 packages/wrt/wrt-utils.bb create mode 100644 packages/wrt/wrt-utils/libshared-makefile.diff create mode 100644 packages/wrt/wrt-utils/nvram-makefile.diff diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf index a9c9b799c2..4df924d07c 100644 --- a/conf/machine/wrt54.conf +++ b/conf/machine/wrt54.conf @@ -8,20 +8,8 @@ IPKG_ARCHS = "all mipsel ${MACHINE}" SERIAL_CONSOLE = "tts/0" -ROUTER_MODULES = "ipv6 \ -ipsec \ -mip6-mn \ -tun \ -loop \ -sunrpc nfs \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -input uinput \ -" - BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel-module-wl kernel-module-et" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel-module-wl kernel-module-et kernel-module-wlcompat wrt-init wrt-utils" BOOTSTRAP_EXTRA_RRECOMMENDS = "" PREFERRED_PROVIDER_virtual/kernel = "linux-wrt" diff --git a/packages/meta/nylon-image-mini.bb b/packages/meta/nylon-image-mini.bb index e69de29bb2..6b1d800ab9 100644 --- a/packages/meta/nylon-image-mini.bb +++ b/packages/meta/nylon-image-mini.bb @@ -0,0 +1,22 @@ +export IMAGE_BASENAME = "nylon-base" + +NYLON_BASE = "base-files base-passwd busybox \ + miniinit \ + netbase \ + wireless-tools" + +DEPENDS = "virtual/kernel \ + ${NYLON_BASE} ${BOOTSTRAP_EXTRA_DEPENDS}" + +RDEPENDS = "kernel \ + ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" + +export IPKG_INSTALL = "${RDEPENDS}" + +IMAGE_LINGUAS = "" + +# we dont need the kernel in the image +ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/boot/zImage*" + +inherit image_ipk +LICENSE = "MIT" diff --git a/packages/oprofile/oprofile-0.8/acinclude.m4 b/packages/oprofile/oprofile-0.9/acinclude.m4 similarity index 100% rename from packages/oprofile/oprofile-0.8/acinclude.m4 rename to packages/oprofile/oprofile-0.9/acinclude.m4 diff --git a/packages/oprofile/oprofile-0.8/no_arm_mapping_syms.patch b/packages/oprofile/oprofile-0.9/no_arm_mapping_syms.patch similarity index 100% rename from packages/oprofile/oprofile-0.8/no_arm_mapping_syms.patch rename to packages/oprofile/oprofile-0.9/no_arm_mapping_syms.patch diff --git a/packages/oprofile/oprofile_0.8.bb b/packages/oprofile/oprofile/acinclude.m4 similarity index 100% rename from packages/oprofile/oprofile_0.8.bb rename to packages/oprofile/oprofile/acinclude.m4 diff --git a/packages/qpe-gaim/qpe-libgaim_1.3.0.bb b/packages/oprofile/oprofile/no_arm_mapping_syms.patch similarity index 100% rename from packages/qpe-gaim/qpe-libgaim_1.3.0.bb rename to packages/oprofile/oprofile/no_arm_mapping_syms.patch diff --git a/packages/wrt/nvram.bb b/packages/oprofile/oprofile_0.9.bb similarity index 100% rename from packages/wrt/nvram.bb rename to packages/oprofile/oprofile_0.9.bb diff --git a/packages/wrt/nvram/nvram-Makefile.diff b/packages/oprofile/oprofile_cvs.bb similarity index 100% rename from packages/wrt/nvram/nvram-Makefile.diff rename to packages/oprofile/oprofile_cvs.bb diff --git a/packages/wrt/wrt-utils-native.bb b/packages/qpe-gaim/qpe-libgaim_1.3.1.bb similarity index 100% rename from packages/wrt/wrt-utils-native.bb rename to packages/qpe-gaim/qpe-libgaim_1.3.1.bb diff --git a/packages/wrt/wrt-imagetools-native.bb b/packages/wrt/wrt-imagetools-native.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wrt/wrt-utils.bb b/packages/wrt/wrt-utils.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wrt/wrt-utils/libshared-makefile.diff b/packages/wrt/wrt-utils/libshared-makefile.diff new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wrt/wrt-utils/nvram-makefile.diff b/packages/wrt/wrt-utils/nvram-makefile.diff new file mode 100644 index 0000000000..e69de29bb2 -- 2.39.5