From e9136650b58e24c4641e7cf008c857f349c92c03 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 25 Aug 2014 12:24:29 -0400 Subject: recipes-dangling: remove all dangling bbappends Signed-off-by: Bruce Ashfield --- .../recipes-dangling/apache2/apache2_2.4.10.bbappend | 15 --------------- .../recipes-dangling/apache2/apache2_2.4.2.bbappend | 5 ----- .../recipes-dangling/apache2/apache2_2.4.7.bbappend | 15 --------------- .../recipes-dangling/apache2/apache2_2.4.9.bbappend | 15 --------------- 4 files changed, 50 deletions(-) delete mode 100644 meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend delete mode 100644 meta-openstack/recipes-dangling/apache2/apache2_2.4.2.bbappend delete mode 100644 meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend delete mode 100644 meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend (limited to 'meta-openstack/recipes-dangling/apache2') diff --git a/meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend deleted file mode 100644 index 7aca867..0000000 --- a/meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -INC := "${@int(PRINC) + 1}" - -do_install_append() { - sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf - - # default layout for htdocsdir in 2.4.7 is different, create the following for - # backward compatibility reasons - - mkdir -p ${D}${datadir}/${BPN}/default-site - ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs - - sed -i '30i if [ ! -e /var/log/apache2 ]; then ln -sf /var/apache2/logs/ /var/log/apache2; fi' ${D}/etc/init.d/apache2 -} - -FILES_${PN} += "${datadir}/${BPN}/default-site" diff --git a/meta-openstack/recipes-dangling/apache2/apache2_2.4.2.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.2.bbappend deleted file mode 100644 index 664de2c..0000000 --- a/meta-openstack/recipes-dangling/apache2/apache2_2.4.2.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -INC := "${@int(PRINC) + 1}" - -do_install_append() { - sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf -} diff --git a/meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend deleted file mode 100644 index 7aca867..0000000 --- a/meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -INC := "${@int(PRINC) + 1}" - -do_install_append() { - sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf - - # default layout for htdocsdir in 2.4.7 is different, create the following for - # backward compatibility reasons - - mkdir -p ${D}${datadir}/${BPN}/default-site - ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs - - sed -i '30i if [ ! -e /var/log/apache2 ]; then ln -sf /var/apache2/logs/ /var/log/apache2; fi' ${D}/etc/init.d/apache2 -} - -FILES_${PN} += "${datadir}/${BPN}/default-site" diff --git a/meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend deleted file mode 100644 index 7aca867..0000000 --- a/meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -INC := "${@int(PRINC) + 1}" - -do_install_append() { - sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf - - # default layout for htdocsdir in 2.4.7 is different, create the following for - # backward compatibility reasons - - mkdir -p ${D}${datadir}/${BPN}/default-site - ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs - - sed -i '30i if [ ! -e /var/log/apache2 ]; then ln -sf /var/apache2/logs/ /var/log/apache2; fi' ${D}/etc/init.d/apache2 -} - -FILES_${PN} += "${datadir}/${BPN}/default-site" -- cgit v1.2.3-54-g00ecf