summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-11 19:58:51 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-11 19:58:51 +0000
commitd36b786d91e98545dae070cdbaea79b087d6b3fc (patch)
tree1f1be7b2b8115f90020bbb5dd6f1d5a85e17f181
parentde5576b350d664c1df1dd03f6641c64c27515d93 (diff)
Move SUDO_SITE to ATMEL_MIRROR, No cross-compiler patches for later versions which does not build without, fix installation
-rw-r--r--package/sudo/sudo-1.6.8p12-001-ubuntu6.patch (renamed from package/sudo/sudo_1.6.8p12-1ubuntu6.patch)0
-rw-r--r--package/sudo/sudo-1.6.8p12-002-no-cxx-configcheck.patch (renamed from package/sudo/sudo_1.6.8p12-2-no-cxx-configcheck.patch)0
-rw-r--r--package/sudo/sudo-1.6.8p12-003-cross-compile.patch (renamed from package/sudo/sudo-crosscompile.patch)0
-rw-r--r--package/sudo/sudo.mk24
4 files changed, 19 insertions, 5 deletions
diff --git a/package/sudo/sudo_1.6.8p12-1ubuntu6.patch b/package/sudo/sudo-1.6.8p12-001-ubuntu6.patch
index a370bd06c..a370bd06c 100644
--- a/package/sudo/sudo_1.6.8p12-1ubuntu6.patch
+++ b/package/sudo/sudo-1.6.8p12-001-ubuntu6.patch
diff --git a/package/sudo/sudo_1.6.8p12-2-no-cxx-configcheck.patch b/package/sudo/sudo-1.6.8p12-002-no-cxx-configcheck.patch
index 0a0b0a46a..0a0b0a46a 100644
--- a/package/sudo/sudo_1.6.8p12-2-no-cxx-configcheck.patch
+++ b/package/sudo/sudo-1.6.8p12-002-no-cxx-configcheck.patch
diff --git a/package/sudo/sudo-crosscompile.patch b/package/sudo/sudo-1.6.8p12-003-cross-compile.patch
index f8ba17338..f8ba17338 100644
--- a/package/sudo/sudo-crosscompile.patch
+++ b/package/sudo/sudo-1.6.8p12-003-cross-compile.patch
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 3991eae97..d36b5319d 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -5,8 +5,15 @@
#############################################################
SUDO_VERSION:=1.6.8p12
+#SUDO_SITE:=ftp://ftp.sudo.ws/pub/sudo/
+SUDO_SITE:=$(BR2_ATMEL_MIRROR)
+
+#SUDO_VERSION:=1.7.0
+#SUDO_SITE:=http://www.courtesan.com/sudo/dist
+# 1.7.0 Needs update Cross-Compiler patches
+
+
SUDO_SOURCE:=sudo-$(SUDO_VERSION).tar.gz
-SUDO_SITE:=http://www.courtesan.com/sudo/dist
SUDO_DIR:=$(BUILD_DIR)/sudo-$(SUDO_VERSION)
SUDO_UNZIP:=$(ZCAT)
@@ -17,7 +24,7 @@ sudo-source: $(DL_DIR)/$(SUDO_SOURCE) $(SUDO_CONFIG_FILE)
$(SUDO_DIR)/.unpacked: $(DL_DIR)/$(SUDO_SOURCE)
$(SUDO_UNZIP) $(DL_DIR)/$(SUDO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(SUDO_DIR) package/sudo sudo\*.patch
+ toolchain/patch-kernel.sh $(SUDO_DIR) package/sudo sudo-$(SUDO_VERSION)\*.patch
$(CONFIG_UPDATE) $(SUDO_DIR)
touch $@
@@ -57,14 +64,21 @@ $(SUDO_DIR)/sudo: $(SUDO_DIR)/.configured
touch -c $@
$(TARGET_DIR)/usr/bin/sudo: $(SUDO_DIR)/sudo
- $(INSTALL) -m 4555 -D $(SUDO_DIR)/sudo $(TARGET_DIR)/usr/bin/sudo
- $(INSTALL) -m 0555 -D $(SUDO_DIR)/visudo $(TARGET_DIR)/usr/sbin/visudo
- $(INSTALL) -m 0440 -D $(SUDO_DIR)/sudoers $(TARGET_DIR)/etc/sudoers
+ rm -f $(TARGET_DIR)/usr/bin/sudo
+ rm -f $(TARGET_DIR)/usr/sbin/visudo
+ rm -f $(TARGET_DIR)/etc/sudoers
+ $(INSTALL) -m 0777 -D $(SUDO_DIR)/sudo $(TARGET_DIR)/usr/bin/sudo
+ $(INSTALL) -m 0777 -D $(SUDO_DIR)/visudo $(TARGET_DIR)/usr/sbin/visudo
$(STRIPCMD) $(TARGET_DIR)/usr/bin/sudo $(TARGET_DIR)/usr/sbin/visudo
+ chmod 4555 $(TARGET_DIR)/usr/bin/sudo
+ chmod 0555 $(TARGET_DIR)/usr/sbin/visudo
+ $(INSTALL) -m 0440 -D $(SUDO_DIR)/sudoers $(TARGET_DIR)/etc/sudoers
touch -c $(TARGET_DIR)/usr/bin/sudo
sudo: uclibc $(TARGET_DIR)/usr/bin/sudo
+sudo-unpacked: $(SUDO_DIR)/.unpacked
+
sudo-clean:
rm -f $(TARGET_DIR)/usr/bin/sudo $(TARGET_DIR)/etc/sudoers \
$(TARGET_DIR)/usr/sbin/visudo